合并分支

src/views/modules/base/community/roomForm.vue

@@ -41,19 +41,23 @@
         </el-form-item>
 
         <div v-if="formType === 'detail'">
-            <el-form-item label="房屋编码"
+          <el-form-item label="房屋编码"
                         prop="houseCode"
                         label-width="150px"
                         style="display: block">
             <el-input class="item_width_1"
-                        maxlength="30"
+                      maxlength="30"
-                        v-model="dataForm.houseCode">
+                      v-model="dataForm.houseCode">
             </el-input>
-            </el-form-item>
+          </el-form-item>
-            <div v-if="dataForm.houseQrcodeUrl" style="display: flex;flex-direction: column;">
+          <div v-if="dataForm.houseQrcodeUrl"
-                <img style="margin-left: 70px;width: 200px;" :src="dataForm.houseQrcodeUrl">
+               style="display: flex;flex-direction: column;">
-                <a style="margin-left: 80px" :href="dataForm.houseQrcodeUrl" target="_blank">下载</a>
+            <img style="margin-left: 70px;width: 200px;"
-            </div>
+                 :src="dataForm.houseQrcodeUrl">
+            <a style="margin-left: 80px"
+               :href="dataForm.houseQrcodeUrl"
+               target="_blank">下载</a>
+          </div>
         </div>
         <el-form-item label="房屋类型"
                       prop="houseType"

src/views/modules/visual/components/screen-map/index.vue

@@ -217,7 +217,7 @@ const vueGis = {
       // });
 
       //初始化地图
-      this.initMap();
+      this.initMap()
       if (this.showPolIconLayer) {
         console.log("showPolIconLayer++++++++++++++++++++++", this.showPolIconLayer);
         //初始化多边形标注图层
@@ -532,6 +532,10 @@ const vueGis = {
         mapView.setCenter(this.centerPoint);
       }
       mapView.setZoom(this.zoom);
+<<<<<<< HEAD
+=======
+
+>>>>>>> dev-fangwu
     },
     firstCentermap() {
       if (this.mapInfo.longitude && this.mapInfo.latitude) {