diff --git a/src/views/modules/base/communityYantai/communityDetail.vue b/src/views/modules/base/communityYantai/communityDetail.vue
index f08478197..09e207be8 100644
--- a/src/views/modules/base/communityYantai/communityDetail.vue
+++ b/src/views/modules/base/communityYantai/communityDetail.vue
@@ -1,263 +1,253 @@
 <template>
-  <div>
-    <div class="dialog-h-content scroll-h">
-
-      <div v-if="initLoading"
-           class="m-row">
-        <div class="m-info">
-          <div class="info-prop">
-            <span class="info-title-2">所属组织：</span>
-            <span>{{ dataForm.agencyName }}</span>
-          </div>
-
-          <div class="info-prop">
-            <span class="info-title-2">所属网格：</span>
-            <span>{{ dataForm.gridName?dataForm.gridName:'--' }}</span>
-          </div>
-
-          <div class="info-prop">
-            <span class="info-title-2">小区名称：</span>
-            <span>{{ dataForm.neighborHoodName}}</span>
-          </div>
-
-          <div class="info-prop">
-            <span class="info-title-2">小区编码：</span>
-            <span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
-          </div>
-
-          <div v-if="dataForm.qrcodeUrl"
-               style="display: flex;flex-direction: column;">
-            <img style="margin-left: 70px;width: 200px;"
-                 :src="dataForm.qrcodeUrl">
-            <a style="margin-left: 80px"
-               :href="dataForm.qrcodeUrl"
-               target="_blank">下载</a>
-          </div>
-
-          <div class="info-prop">
-            <span class="info-title-2">关联物业：</span>
-            <span>{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}</span>
-          </div>
-          <div class="info-prop">
-            <span class="info-title-2">实有楼栋：</span>
-            <span>{{dataForm.realBuilding?dataForm.realBuilding:0 }}</span>
-          </div>
-
-          <div class="info-prop">
-            <span class="info-title-2">详细地址：</span>
-            <span>{{ dataForm.address }}</span>
-          </div>
-
-          <div class="info-prop">
-            <span class="info-title-2">地图位置：</span>
-            <div class="div_map">
-
-              <div id="app_detail_community"></div>
-
-            </div>
-          </div>
-
-        </div>
-      </div>
-
-    </div>
-    <div class="div-btn">
-      <el-button size="small"
-                 @click="handleCancle">关 闭</el-button>
-
-    </div>
-  </div>
+	<div>
+		<div class="dialog-h-content scroll-h">
+			<div v-if="initLoading" class="m-row">
+				<div class="m-info">
+					<div class="info-prop">
+						<span class="info-title-2">所属组织：</span>
+						<span>{{ dataForm.agencyName }}</span>
+					</div>
+					<div class="info-prop">
+						<span class="info-title-2">所属网格：</span>
+						<span>{{ dataForm.gridName?dataForm.gridName:'--' }}</span>
+					</div>
+					<div class="info-prop">
+						<span class="info-title-2">小区/自然村名称：</span>
+						<span>{{ dataForm.neighborHoodName?dataForm.neighborHoodName:'--' }}</span>
+					</div>
+					<div class="info-prop">
+						<span class="info-title-2">小区/自然村类型：</span>
+						<span>{{ dataForm.viliageType?dataForm.viliageType:'--' }}</span>
+					</div>
+					<div class="info-prop">
+						<span class="info-title-2">小区编码：</span>
+						<span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
+					</div>
+					<div class="info-prop">
+						<span class="info-title-2">面积：</span>
+						<span>{{ dataForm.area?dataForm.area:'--'}}</span>
+					</div>
+					<div class="info-prop">
+						<span class="info-title-2">开放类型：</span>
+						<span>{{ dataForm.openType?dataForm.openType:'--'}}</span>
+					</div>
+					<div class="info-prop">
+						<span class="info-title-2">建筑年代：</span>
+						<span>{{ dataForm.buildYear?dataForm.buildYear:'--'}}</span>
+					</div>
+					<div v-if="dataForm.qrcodeUrl" style="display: flex;flex-direction: column;">
+						<img style="margin-left: 70px;width: 200px;" :src="dataForm.qrcodeUrl">
+						<a style="margin-left: 80px" :href="dataForm.qrcodeUrl" target="_blank">下载</a>
+					</div>
+					<div class="info-prop">
+						<span class="info-title-2">关联物业：</span>
+						<span>{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}</span>
+					</div>
+					<div class="info-prop">
+						<span class="info-title-2">实有楼栋：</span>
+						<span>{{dataForm.realBuilding?dataForm.realBuilding:0 }}</span>
+					</div>
+					<div class="info-prop">
+						<span class="info-title-2">详细地址：</span>
+						<span>{{ dataForm.address }}</span>
+					</div>
+					<div class="info-prop">
+						<span class="info-title-2">地图位置：</span>
+						<div class="div_map">
+							<div id="app_detail_community"></div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="div-btn">
+			<el-button size="small" @click="handleCancle">关 闭</el-button>
+		</div>
+	</div>
 </template>
-
 <script>
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
-import daiMap from "@/utils/dai-map";
-var map
-var search
-var markers
-var infoWindowList
-let loading // 加载动画
-export default {
-  data () {
-    return {
-
-      btnDisable: false,
-      initLoading: false,
-
-      dataForm: {
-        neighborHoodName: '', // 小区名称【不超过50字】
-        agencyId: '', // 所属组织ID
-        agencyName: '',
-        gridId: '', //所属网格ID
-        propertyId: '', //关联物业
-        address: '', //详细地址
-        remark: '', //备注【最大500字】
-        location: '', //坐标位置
-        longitude: '', //经度
-        latitude: '', //纬度
-        realBuilding: 0,
-        coding: '',
-        sysCoding: ''
-      },
-
-
-    }
-  },
-  components: {},
-  mounted () {
-
-  },
-
-  methods: {
-    handleCancle () {
-      this.diaDestroy()
-      this.$emit('diaDetailClose')
-
-    },
-    diaDestroy () {
-      if (map) {
-        // map.destroy()
-      }
-    },
-
-    async initForm (row) {
-      this.dataForm = JSON.parse(JSON.stringify(row))
-
-      let propertyShowList = []
-      this.dataForm.propertyList.forEach(element => {
-        propertyShowList.push(element.name)
-      });
-
-      this.dataForm.propertyShow = propertyShowList.join(',')
-
-      this.initLoading = true
-      let { latitude, longitude } = this.$store.state.user;
-      console.log('lat' + latitude + ',lon' + longitude)
-      if (this.dataForm.latitude && this.dataForm.longitude) {
-        latitude = this.dataForm.latitude
-        longitude = this.dataForm.longitude
-      }
-      if (!latitude || latitude == "" || latitude == "0") {
-        latitude = 39.9088810666821;
-        longitude = 116.39743841556731;
-      }
-
-      this.$nextTick(() => {
-        if (!map) {
-          this.initMap(latitude, longitude)
-        } else {
-          map.setCenter(latitude, longitude);
-          map.setMarker(latitude, longitude);
-        }
-
-      })
-
-    },
-
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap (latitude, longitude) {
-
-      map = new daiMap(
-        document.getElementById("app_detail_community"),
-        { latitude, longitude },
-        {
-          zoom: 16.2, // 设置地图缩放级别
-          pitch: 43.5, // 设置俯仰角
-          rotation: 45, // 设置地图旋转角度
-        }
-      );
-
-      // // 监听地图平移结束
-      // map.on("dragend", (e) => {
-      //   this.handleMoveCenter(e);
-      // });
-
-      map.setCenter(latitude, longitude);
-      map.setMarker(latitude, longitude);
-
-    },
-
-
-
-    resetData () {
-
-      this.dataForm = {
-        neighborHoodName: '', // 小区名称【不超过50字】
-        agencyId: '', // 所属组织ID
-        agencyName: '',
-        gridId: '', //所属网格ID
-        propertyId: '', //关联物业
-        address: '', //详细地址
-        remark: '', //备注【最大500字】
-        location: '', //坐标位置
-        longitude: '', //经度
-        latitude: '', //纬度
-        realBuilding: 0,
-        coding: '',
-        sysCoding: ''
-      }
-
-    },
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        neighborHoodName: [
-          { required: true, message: '小区名称不能为空', trigger: 'blur' },
-          {
-            min: 1,
-            max: 50,
-            message: '小区名称长度在 1 到 50个字符',
-            trigger: 'blur'
-          }
-        ],
-        agencyId: [
-          { required: true, message: '所属组织不能为空', trigger: 'blur' }
-        ],
-        gridId: [
-          { required: true, message: '所属网格不能为空', trigger: 'blur' }
-        ],
-        coding: [
-          { required: true, message: '小区编码不能为空', trigger: 'blur' }
-        ],
-        address: [
-          { required: true, message: '详细地址不能为空', trigger: 'blur' }
-        ],
-        longitude: [
-          { required: true, message: '坐标不能为空', trigger: 'blur' }
-        ]
-      }
-    },
-    propertyRule () {
-      name: [
-        { required: true, message: '物业名称不能为空', trigger: 'blur' }
-        // { min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
-      ]
-    }
-  },
-  props: {}
-}
+	import {
+		mapGetters
+	} from 'vuex'
+	import {
+		Loading
+	} from 'element-ui' // 引入Loading服务
+	import {
+		requestPost
+	} from '@/js/dai/request'
+	import daiMap from "@/utils/dai-map";
+	var map
+	var search
+	var markers
+	var infoWindowList
+	let loading // 加载动画
+	export default {
+		data() {
+			return {
+				btnDisable: false,
+				initLoading: false,
+				dataForm: {
+					neighborHoodName: '', // 小区名称【不超过50字】
+					agencyId: '', // 所属组织ID
+					agencyName: '',
+					gridId: '', //所属网格ID
+					propertyId: '', //关联物业
+					address: '', //详细地址
+					remark: '', //备注【最大500字】
+					location: '', //坐标位置
+					longitude: '', //经度
+					latitude: '', //纬度
+					realBuilding: 0,
+					coding: '',
+					sysCoding: ''
+				},
+			}
+		},
+		components: {},
+		mounted() {},
+		methods: {
+			handleCancle() {
+				this.diaDestroy()
+				this.$emit('diaDetailClose')
+			},
+			diaDestroy() {
+				if (map) {
+					// map.destroy()
+				}
+			},
+			async initForm(row) {
+				this.dataForm = JSON.parse(JSON.stringify(row))
+				let propertyShowList = []
+				this.dataForm.propertyList.forEach(element => {
+					propertyShowList.push(element.name)
+				});
+				this.dataForm.propertyShow = propertyShowList.join(',')
+				this.initLoading = true
+				let {
+					latitude,
+					longitude
+				} = this.$store.state.user;
+				console.log('lat' + latitude + ',lon' + longitude)
+				if (this.dataForm.latitude && this.dataForm.longitude) {
+					latitude = this.dataForm.latitude
+					longitude = this.dataForm.longitude
+				}
+				if (!latitude || latitude == "" || latitude == "0") {
+					latitude = 39.9088810666821;
+					longitude = 116.39743841556731;
+				}
+				this.$nextTick(() => {
+					if (!map) {
+						this.initMap(latitude, longitude)
+					} else {
+						map.setCenter(latitude, longitude);
+						map.setMarker(latitude, longitude);
+					}
+				})
+			},
+			// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+			initMap(latitude, longitude) {
+				map = new daiMap(document.getElementById("app_detail_community"), {
+					latitude,
+					longitude
+				}, {
+					zoom: 16.2, // 设置地图缩放级别
+					pitch: 43.5, // 设置俯仰角
+					rotation: 45, // 设置地图旋转角度
+				});
+				// // 监听地图平移结束
+				// map.on("dragend", (e) => {
+				//   this.handleMoveCenter(e);
+				// });
+				map.setCenter(latitude, longitude);
+				map.setMarker(latitude, longitude);
+			},
+			resetData() {
+				this.dataForm = {
+					neighborHoodName: '', // 小区名称【不超过50字】
+					agencyId: '', // 所属组织ID
+					agencyName: '',
+					gridId: '', //所属网格ID
+					propertyId: '', //关联物业
+					address: '', //详细地址
+					remark: '', //备注【最大500字】
+					location: '', //坐标位置
+					longitude: '', //经度
+					latitude: '', //纬度
+					realBuilding: 0,
+					coding: '',
+					sysCoding: ''
+				}
+			},
+			// 开启加载动画
+			startLoading() {
+				loading = Loading.service({
+					lock: true, // 是否锁定
+					text: '正在加载……', // 加载中需要显示的文字
+					background: 'rgba(0,0,0,.7)' // 背景颜色
+				})
+			},
+			// 结束加载动画
+			endLoading() {
+				// clearTimeout(timer);
+				if (loading) {
+					loading.close()
+				}
+			}
+		},
+		computed: {
+			dataRule() {
+				return {
+					neighborHoodName: [{
+						required: true,
+						message: '小区名称不能为空',
+						trigger: 'blur'
+					}, {
+						min: 1,
+						max: 50,
+						message: '小区名称长度在 1 到 50个字符',
+						trigger: 'blur'
+					}],
+					agencyId: [{
+						required: true,
+						message: '所属组织不能为空',
+						trigger: 'blur'
+					}],
+					gridId: [{
+						required: true,
+						message: '所属网格不能为空',
+						trigger: 'blur'
+					}],
+					coding: [{
+						required: true,
+						message: '小区编码不能为空',
+						trigger: 'blur'
+					}],
+					address: [{
+						required: true,
+						message: '详细地址不能为空',
+						trigger: 'blur'
+					}],
+					longitude: [{
+						required: true,
+						message: '坐标不能为空',
+						trigger: 'blur'
+					}]
+				}
+			},
+			propertyRule() {
+				name: [{
+						required: true,
+						message: '物业名称不能为空',
+						trigger: 'blur'
+					}
+					// { min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
+				]
+			}
+		},
+		props: {}
+	}
 </script>
-<style lang="scss" scoped >
-@import "@/assets/scss/modules/management/detail-main.scss";
-</style>
-
-
-
+<style lang="scss" scoped>
+	@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
\ No newline at end of file
diff --git a/src/views/modules/base/communityYantai/communityForm.vue b/src/views/modules/base/communityYantai/communityForm.vue
index 68285de06..493db39e7 100644
--- a/src/views/modules/base/communityYantai/communityForm.vue
+++ b/src/views/modules/base/communityYantai/communityForm.vue
@@ -8,7 +8,8 @@
 					</el-form-item>
 					<el-form-item label="所属网格" prop="gridId" label-width="150px" style="display: block">
 						<el-select class="item_width_1" v-model="dataForm.gridId" placeholder="请选择" clearable>
-							<el-option v-for="item in gridList" :key="item.gridId" :label="item.gridName" :value="item.gridId"></el-option>
+							<el-option v-for="item in gridList" :key="item.gridId" :label="item.gridName"
+								:value="item.gridId"></el-option>
 						</el-select>
 					</el-form-item>
 					<!-- /**
@@ -29,91 +30,79 @@
     private String buildYear; -->
 					<!--小区/自然村类型 面积 开放类型 建筑年代 tianqian -->
 					<el-form-item label="小区/自然村名称" prop="neighborHoodName" label-width="150px" style="display: block">
-						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入小区/自然村名称" v-model="dataForm.neighborHoodName"></el-input>
+						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入小区/自然村名称"
+							v-model="dataForm.neighborHoodName"></el-input>
 					</el-form-item>
 					<el-form-item label="小区/自然村类型" prop="viliageType" label-width="150px" style="display: block">
 						<el-select v-model="dataForm.viliageType" clearable placeholder="小区/自然村类型">
-							<el-option v-for="item in viliageTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+							<el-option v-for="item in viliageTypeList" :key="item.value" :label="item.label"
+								:value="item.value"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item label="小区编码" prop="coding" label-width="150px" style="display: block">
-						<el-input class="item_width_2" maxlength="50" placeholder="请输入楼栋编码" v-model="dataForm.coding"></el-input>
-						<el-button style="margin-left: 10px" type="primary" size="small" @click="handleCode">生成</el-button>
+						<el-input class="item_width_2" maxlength="50" placeholder="请输入楼栋编码"
+							v-model="dataForm.coding"></el-input>
+						<el-button style="margin-left: 10px" type="primary" size="small"
+							@click="handleCode">生成</el-button>
 					</el-form-item>
-
 					<div v-if="dataForm.qrcodeUrl" style="display: flex;flex-direction: column;">
 						<img style="margin-left: 70px;width: 200px;" :src="dataForm.qrcodeUrl" />
 						<a style="margin-left: 80px" :href="dataForm.qrcodeUrl" target="_blank">下载</a>
 					</div>
 					<!-- 面积 开放类型 建筑年代 tianqian -->
 					<el-form-item label="面积" prop="area" label-width="150px" style="display: block">
-						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入面积" v-model="dataForm.area"></el-input>
+						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入面积"
+							v-model="dataForm.area"></el-input>
 					</el-form-item>
 					<el-form-item label="开放类型" prop="openType" label-width="150px" style="display: block">
 						<el-select v-model="dataForm.openType" clearable placeholder="开放类型">
-							<el-option v-for="item in openTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+							<el-option v-for="item in openTypeList" :key="item.value" :label="item.label"
+								:value="item.value"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item label="建筑年代" prop="buildYear" label-width="150px" style="display: block">
-						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入建筑年代" v-model="dataForm.buildYear"></el-input>
+						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入建筑年代"
+							v-model="dataForm.buildYear"></el-input>
 					</el-form-item>
 					<el-form-item label="关联物业" prop="propertyId" label-width="150px" style="display: block">
-						<el-select class="item_width_2" v-model="dataForm.propertyId" placeholder="请选择" filterable clearable>
-							<el-option v-for="item in propertyList" :key="item.propertyId" :label="item.propertyName" :value="item.propertyId"></el-option>
+						<el-select class="item_width_2" v-model="dataForm.propertyId" placeholder="请选择" filterable
+							clearable>
+							<el-option v-for="item in propertyList" :key="item.propertyId" :label="item.propertyName"
+								:value="item.propertyId"></el-option>
 						</el-select>
-
-						<el-button style="margin-left: 10px" type="primary" size="small" @click="handleAddProperty">添加物业</el-button>
+						<el-button style="margin-left: 10px" type="primary" size="small"
+							@click="handleAddProperty">添加物业</el-button>
 					</el-form-item>
 					<el-form-item label="实有楼栋" style="display: block" prop="realBuilding" label-width="150px">
-						<el-input-number class="item_width_4" v-model="dataForm.realBuilding" :min="0" :max="9999" label="总户数"></el-input-number>
+						<el-input-number class="item_width_4" v-model="dataForm.realBuilding" :min="0" :max="9999"
+							label="总户数"></el-input-number>
 					</el-form-item>
-
 					<el-form-item label="地图位置" prop="longitude" label-width="150px" style="display: block">
 						<div style="width: 500px">
-							<el-select
-								v-model="searchValue"
-								filterable
-								style="width: 500px"
-								remote
-								:reserve-keyword="true"
-								placeholder="请输入关键词"
-								:remote-method="remoteMethod"
-								:loading="loading"
-							>
-								<el-option
-									v-for="(item, index) in searchOptions"
-									@click.native="handleClickKey(index)"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"
-								></el-option>
+							<el-select v-model="searchValue" filterable style="width: 500px" remote
+								:reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+								:loading="loading">
+								<el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+									:key="item.value" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 							<div id="app_community" class="div_map"></div>
 						</div>
 					</el-form-item>
-
 					<el-form-item label="详细地址" prop="address" label-width="150px" style="display: block">
-						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入详细地址" v-model="dataForm.address"></el-input>
+						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入详细地址"
+							v-model="dataForm.address"></el-input>
 					</el-form-item>
-
 					<el-form-item label="备注" prop="remark" label-width="150px" style="display: block">
-						<el-input
-							class="item_width_1"
-							type="textarea"
-							maxlength="500"
-							show-word-limit
-							:rows="3"
-							placeholder="请输入备注，不超过500字"
-							v-model="dataForm.remark"
-						></el-input>
+						<el-input class="item_width_1" type="textarea" maxlength="500" show-word-limit :rows="3"
+							placeholder="请输入备注，不超过500字" v-model="dataForm.remark"></el-input>
 					</el-form-item>
 				</el-form>
 			</div>
-
 			<div v-show="propertyFormShow">
 				<el-form :inline="false" :model="propertyForm" :rules="propertyRule" class="form">
 					<el-form-item label="物业名称" prop="name" label-width="150px" style="display: block">
-						<el-input class="item_width_1" maxlength="10" placeholder="请输入小区名称" v-model="propertyForm.name"></el-input>
+						<el-input class="item_width_1" maxlength="10" placeholder="请输入小区名称"
+							v-model="propertyForm.name"></el-input>
 					</el-form-item>
 				</el-form>
 			</div>
@@ -124,409 +113,446 @@
 		</div>
 	</div>
 </template>
-
 <script>
-import { mapGetters } from 'vuex';
-import { Loading } from 'element-ui'; // 引入Loading服务
-import { requestPost } from '@/js/dai/request';
-import daiMap from '@/utils/dai-map';
-var map;
-var search;
-var markers;
-var infoWindowList;
-let loading; // 加载动画
-export default {
-	data() {
-		return {
-			formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-			searchOptions: [],
-			searchValue: '',
-			resultList: [],
-			loading: false,
-
-			gridList: [],
-			propertyList: [],
-			btnDisable: false,
-
-			neighborHoodId: '', //小区ID
-			dataForm: {
-				neighborHoodName: '', // 小区名称【不超过50字】
-				agencyId: '', // 所属组织ID
-				agencyName: '',
-				gridId: '', //所属网格ID
-				propertyId: '', //关联物业
-				address: '', //详细地址
-				remark: '', //备注【最大500字】
-				location: '', //坐标位置
-				longitude: '', //经度
-				latitude: '', //纬度
-				realBuilding: 0,
-				coding: '',
-				sysCoding: '',
-				viliageType: '',
-				area: '',
-				openType: '',
-				buildYear: '',
-			},
-
-			propertyFormShow: false,
-			propertyForm: {
-				name: ''
-			},
-
-			keyWords: '',
-			agencyObj: {},
-			viliageTypeList: [],
-			openTypeList: []
-		};
-	},
-	components: {},
-	mounted() {},
-
-	methods: {
-		async initForm(type, row, agencyObj) {
-			this.$refs.ref_form.resetFields();
-			this.agencyObj = agencyObj;
-			let { latitude, longitude } = this.$store.state.user;
-			this.formType = type;
-			if (row) {
-				this.dataForm = JSON.parse(JSON.stringify(row));
-
-				this.dataForm.neighborHoodId = this.dataForm.id;
-				this.neighborHoodId = this.dataForm.neighborHoodId;
-			} else {
-				this.dataForm.latitude = latitude;
-				this.dataForm.longitude = longitude;
-			}
-			if (!map) {
-				this.initMap(this.dataForm.latitude, this.dataForm.longitude);
-			} else {
-				map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
-				map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
-			}
-			await this.loadAgency();
-			await this.loadGrid();
-			await this.loadProperty();
-			await this.getViliageTypeList();
-			await this.getOpenTypeList();
+	import {
+		mapGetters
+	} from 'vuex';
+	import {
+		Loading
+	} from 'element-ui'; // 引入Loading服务
+	import {
+		requestPost
+	} from '@/js/dai/request';
+	import daiMap from '@/utils/dai-map';
+	var map;
+	var search;
+	var markers;
+	var infoWindowList;
+	let loading; // 加载动画
+	export default {
+		data() {
+			return {
+				formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+				searchOptions: [],
+				searchValue: '',
+				resultList: [],
+				loading: false,
+				gridList: [],
+				propertyList: [],
+				btnDisable: false,
+				neighborHoodId: '', //小区ID
+				dataForm: {
+					neighborHoodName: '', // 小区名称【不超过50字】
+					agencyId: '', // 所属组织ID
+					agencyName: '',
+					gridId: '', //所属网格ID
+					propertyId: '', //关联物业
+					address: '', //详细地址
+					remark: '', //备注【最大500字】
+					location: '', //坐标位置
+					longitude: '', //经度
+					latitude: '', //纬度
+					realBuilding: 0,
+					coding: '',
+					sysCoding: '',
+					viliageType: '',
+					area: '',
+					openType: '',
+					buildYear: '',
+				},
+				propertyFormShow: false,
+				propertyForm: {
+					name: ''
+				},
+				keyWords: '',
+				agencyObj: {},
+				viliageTypeList: [],
+				openTypeList: []
+			};
 		},
-		// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-		initMap(latitude, longitude) {
-			map = new daiMap(
-				document.getElementById('app_community'),
-				{ latitude, longitude },
-				{
+		components: {},
+		mounted() {},
+		methods: {
+			async initForm(type, row, agencyObj) {
+				this.$refs.ref_form.resetFields();
+				this.agencyObj = agencyObj;
+				let {
+					latitude,
+					longitude
+				} = this.$store.state.user;
+				this.formType = type;
+				if (row) {
+					this.dataForm = JSON.parse(JSON.stringify(row));
+					this.dataForm.neighborHoodId = this.dataForm.id;
+					this.neighborHoodId = this.dataForm.neighborHoodId;
+				} else {
+					this.dataForm.latitude = latitude;
+					this.dataForm.longitude = longitude;
+				}
+				if (!map) {
+					this.initMap(this.dataForm.latitude, this.dataForm.longitude);
+				} else {
+					map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
+					map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
+				}
+				await this.loadAgency();
+				await this.loadGrid();
+				await this.loadProperty();
+				await this.getViliageTypeList();
+				await this.getOpenTypeList();
+			},
+			// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+			initMap(latitude, longitude) {
+				map = new daiMap(document.getElementById('app_community'), {
+					latitude,
+					longitude
+				}, {
 					zoom: 16.2, // 设置地图缩放级别
 					pitch: 43.5, // 设置俯仰角
 					rotation: 45 // 设置地图旋转角度
+				});
+				// 监听地图平移结束
+				map.on('dragend', e => {
+					this.handleMoveCenter(e);
+				});
+				map.setCenter(latitude, longitude);
+				map.setMarker(latitude, longitude);
+			},
+			async handleMoveCenter() {
+				//修改地图中心点
+				const {
+					lat,
+					lng
+				} = map.getCenter();
+				this.dataForm.latitude = lat;
+				this.dataForm.longitude = lng;
+				map.setMarker(lat, lng);
+				let {
+					msg,
+					data
+				} = await map.getAddress(lat, lng);
+				if (msg == 'success') {
+					this.dataForm.address = data.address;
+					this.searchValue = data.address;
+					this.searchOptions = [];
 				}
-			);
-
-			// 监听地图平移结束
-			map.on('dragend', e => {
-				this.handleMoveCenter(e);
-			});
-
-			map.setCenter(latitude, longitude);
-			map.setMarker(latitude, longitude);
-		},
-
-		async handleMoveCenter() {
-			//修改地图中心点
-			const { lat, lng } = map.getCenter();
-			this.dataForm.latitude = lat;
-			this.dataForm.longitude = lng;
-			map.setMarker(lat, lng);
-
-			let { msg, data } = await map.getAddress(lat, lng);
-			if (msg == 'success') {
-				this.dataForm.address = data.address;
-				this.searchValue = data.address;
-				this.searchOptions = [];
-			}
-		},
-
-		async remoteMethod(query) {
-			if (query !== '') {
-				this.loading = true;
-
-				const { msg, data } = await map.searchNearby(query);
-				this.loading = false;
-				this.resultList = [];
-
-				if (msg == 'success' && data.resultList && data.resultList.length > 0) {
-					if (data.resultList && data.resultList.length > 0) {
-						this.resultList = data.resultList;
-						this.searchOptions = this.resultList.map(item => {
-							return { value: `${item.hotPointID}`, label: `${item.address + item.name}` };
-						});
-					}
-				} else {
-					this.searchOptions = [
-						{
+			},
+			async remoteMethod(query) {
+				if (query !== '') {
+					this.loading = true;
+					const {
+						msg,
+						data
+					} = await map.searchNearby(query);
+					this.loading = false;
+					this.resultList = [];
+					if (msg == 'success' && data.resultList && data.resultList.length > 0) {
+						if (data.resultList && data.resultList.length > 0) {
+							this.resultList = data.resultList;
+							this.searchOptions = this.resultList.map(item => {
+								return {
+									value: `${item.hotPointID}`,
+									label: `${item.address + item.name}`
+								};
+							});
+						}
+					} else {
+						this.searchOptions = [{
 							value: '0',
 							label: '未检索到结果'
+						}];
+					}
+				} else {
+					this.searchOptions = [];
+				}
+			},
+			handleClickKey(index) {
+				let selPosition = this.resultList[index];
+				let lonlat = selPosition.lonlat.split(' ');
+				map.setCenter(lonlat[1], lonlat[0]);
+				map.setMarker(lonlat[1], lonlat[0]);
+				this.dataForm.latitude = lonlat[1];
+				this.dataForm.longitude = lonlat[0];
+				this.dataForm.address = selPosition.address + selPosition.name;
+			},
+			async handleCode() {
+				if (!this.dataForm.gridId) return this.$message.error('请选择网格');
+				const {
+					data,
+					code,
+					msg
+				} = await requestPost('/gov/org/houseInformation/getNeighborHoodCoding/' + this.dataForm.gridId);
+				if (msg == 'success' && code == 0) {
+					this.dataForm.coding = data.coding;
+					this.dataForm.sysCoding = data.sysCoding;
+				}
+			},
+			//加载组织
+			async loadAgency() {
+				const url = '/epmetuser/customerstaff/staffbasicinfo';
+				let params = {};
+				const {
+					data,
+					code,
+					msg
+				} = await requestPost(url, params);
+				if (code === 0) {
+					this.dataForm.agencyId = data.agencyId;
+					this.dataForm.agencyName = data.agencyName;
+				} else {
+					this.$message.error(msg);
+				}
+			},
+			//加载网格
+			async loadGrid() {
+				const url = '/gov/org/grid/allgridsnopermission ';
+				// const url = "https://epmet-dev.elinkservice.cn:7082/api/apimock-v2/95518686fa128a53f64c678906848062/gov/org/grid/allgrids"
+				let params = {
+					agencyId: this.dataForm.agencyId
+				};
+				const {
+					data,
+					code,
+					msg
+				} = await requestPost(url, params);
+				if (code === 0) {
+					this.gridList = data;
+				} else {
+					this.$message.error(msg);
+				}
+			},
+			async getViliageTypeList() {
+				const url = '/sys/dict/data/dictlist';
+				let params = {
+					dictType: 'neighbor_hood_type'
+				};
+				const {
+					data,
+					code,
+					msg
+				} = await requestPost(url, params);
+				if (code === 0) {
+					this.viliageTypeList = data;
+				} else {
+					this.$message.error(msg);
+				}
+			},
+			async getOpenTypeList() {
+				const url = '/sys/dict/data/dictlist';
+				let params = {
+					dictType: 'open_type'
+				};
+				const {
+					data,
+					code,
+					msg
+				} = await requestPost(url, params);
+				if (code === 0) {
+					this.openTypeList = data;
+				} else {
+					this.$message.error(msg);
+				}
+			},
+			//加载物业
+			async loadProperty() {
+				const url = '/gov/org/propertymanagement/list';
+				// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/list"
+				let params = {};
+				const {
+					data,
+					code,
+					msg
+				} = await requestPost(url, params);
+				if (code === 0) {
+					this.propertyList = data;
+				} else {
+					this.$message.error(msg);
+				}
+			},
+			handleAddProperty() {
+				this.propertyForm.name = '';
+				this.propertyFormShow = true;
+			},
+			async handleComfirm() {
+				if (this.propertyFormShow) {
+					this.addProperty();
+				} else {
+					this.btnDisable = true;
+					setTimeout(() => {
+						this.btnDisable = false;
+					}, 10000);
+					this.$refs['ref_form'].validate((valid, messageObj) => {
+						if (!valid) {
+							app.util.validateRule(messageObj);
+							this.btnDisable = false;
+						} else {
+							this.addCommunity();
 						}
-					];
+					});
 				}
-			} else {
-				this.searchOptions = [];
-			}
-		},
-
-		handleClickKey(index) {
-			let selPosition = this.resultList[index];
-			let lonlat = selPosition.lonlat.split(' ');
-			map.setCenter(lonlat[1], lonlat[0]);
-			map.setMarker(lonlat[1], lonlat[0]);
-			this.dataForm.latitude = lonlat[1];
-			this.dataForm.longitude = lonlat[0];
-			this.dataForm.address = selPosition.address + selPosition.name;
-		},
-
-		async handleCode() {
-			if (!this.dataForm.gridId) return this.$message.error('请选择网格');
-			const { data, code, msg } = await requestPost('/gov/org/houseInformation/getNeighborHoodCoding/' + this.dataForm.gridId);
-			if (msg == 'success' && code == 0) {
-				this.dataForm.coding = data.coding;
-				this.dataForm.sysCoding = data.sysCoding;
-			}
-		},
-		//加载组织
-		async loadAgency() {
-			const url = '/epmetuser/customerstaff/staffbasicinfo';
-			let params = {};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				this.dataForm.agencyId = data.agencyId;
-				this.dataForm.agencyName = data.agencyName;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		//加载网格
-		async loadGrid() {
-			const url = '/gov/org/grid/allgridsnopermission ';
-			// const url = "https://epmet-dev.elinkservice.cn:7082/api/apimock-v2/95518686fa128a53f64c678906848062/gov/org/grid/allgrids"
-			let params = {
-				agencyId: this.dataForm.agencyId
-			};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				this.gridList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async getViliageTypeList() {
-			const url = '/sys/dict/data/dictlist';
-
-			let params = {
-				dictType: 'neighbor_hood_type'
-			};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				this.viliageTypeList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async getOpenTypeList() {
-			const url = '/sys/dict/data/dictlist';
-
-			let params = {
-				dictType: 'open_type'
-			};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				this.openTypeList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		//加载物业
-		async loadProperty() {
-			const url = '/gov/org/propertymanagement/list';
-			// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/list"
-			let params = {};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				this.propertyList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		handleAddProperty() {
-			this.propertyForm.name = '';
-			this.propertyFormShow = true;
-		},
-
-		async handleComfirm() {
-			if (this.propertyFormShow) {
-				this.addProperty();
-			} else {
-				this.btnDisable = true;
-				setTimeout(() => {
+			},
+			async addCommunity() {
+				let url = '';
+				if (this.formType === 'add') {
+					url = '/gov/org/neighborhood/neighborhoodadd';
+					// url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
+				} else {
+					url = '/gov/org/neighborhood/neighborhoodupdate';
+					this.dataForm.neighborHoodId = this.neighborHoodId;
+				}
+				console.log("this.dataForm", this.dataForm)
+				const {
+					data,
+					code,
+					msg
+				} = await requestPost(url, this.dataForm);
+				if (code === 0) {
+					this.$message({
+						type: 'success',
+						message: '操作成功'
+					});
+					this.resetData();
+					this.$emit('dialogOk');
 					this.btnDisable = false;
-				}, 10000);
-				this.$refs['ref_form'].validate((valid, messageObj) => {
-					if (!valid) {
-						app.util.validateRule(messageObj);
-						this.btnDisable = false;
-					} else {
-						this.addCommunity();
-					}
-				});
-			}
-		},
-		async addCommunity() {
-			let url = '';
-			if (this.formType === 'add') {
-				url = '/gov/org/neighborhood/neighborhoodadd';
-				// url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
-			} else {
-				url = '/gov/org/neighborhood/neighborhoodupdate';
-
-				this.dataForm.neighborHoodId = this.neighborHoodId;
-			}
-
-			const { data, code, msg } = await requestPost(url, this.dataForm);
-
-			if (code === 0) {
-				this.$message({
-					type: 'success',
-					message: '操作成功'
-				});
-				this.resetData();
-				this.$emit('dialogOk');
-				this.btnDisable = false;
-			} else {
-				this.btnDisable = false;
-				this.$message.error(msg);
-			}
-		},
-		async addProperty() {
-			if (!this.propertyForm.name || this.propertyForm.name === '') {
-				this.$message({
-					type: 'error',
-					message: '物业名称不能为空'
-				});
-				return false;
-			}
-			const url = '/gov/org/propertymanagement/add';
-			// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/add"
-			let params = {
-				name: this.propertyForm.name
-			};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				this.$message({
-					type: 'success',
-					message: '操作成功'
-				});
-
-				this.propertyForm.name = '';
-				this.propertyFormShow = false;
-				this.loadProperty();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		handleCancle() {
-			if (this.propertyFormShow) {
-				this.propertyForm.name = '';
+				} else {
+					this.btnDisable = false;
+					this.$message.error(msg);
+				}
+			},
+			async addProperty() {
+				if (!this.propertyForm.name || this.propertyForm.name === '') {
+					this.$message({
+						type: 'error',
+						message: '物业名称不能为空'
+					});
+					return false;
+				}
+				const url = '/gov/org/propertymanagement/add';
+				// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/add"
+				let params = {
+					name: this.propertyForm.name
+				};
+				const {
+					data,
+					code,
+					msg
+				} = await requestPost(url, params);
+				if (code === 0) {
+					this.$message({
+						type: 'success',
+						message: '操作成功'
+					});
+					this.propertyForm.name = '';
+					this.propertyFormShow = false;
+					this.loadProperty();
+				} else {
+					this.$message.error(msg);
+				}
+			},
+			handleCancle() {
+				if (this.propertyFormShow) {
+					this.propertyForm.name = '';
+					this.propertyFormShow = false;
+				} else {
+					this.resetData();
+					this.$emit('dialogCancle');
+				}
+			},
+			resetData() {
+				this.searchValue = '';
+				this.searchOptions = [];
+				this.resultList = [];
+				this.neighborHoodId = ''; //小区ID
+				this.dataForm = {
+					neighborHoodName: '', // 小区名称【不超过50字】
+					agencyId: '', // 所属组织ID
+					agencyName: '',
+					gridId: '', //所属网格ID
+					propertyId: '', //关联物业
+					address: '', //详细地址
+					remark: '', //备注【最大500字】
+					location: '', //坐标位置
+					longitude: '', //经度
+					latitude: '', //纬度
+					realBuilding: 0,
+					coding: '',
+					sysCoding: '',
+					viliageType: '',
+					area: '',
+					openType: '',
+					buildYear: '',
+				};
 				this.propertyFormShow = false;
-			} else {
-				this.resetData();
-				this.$emit('dialogCancle');
+			},
+			// 开启加载动画
+			startLoading() {
+				loading = Loading.service({
+					lock: true, // 是否锁定
+					text: '正在加载……', // 加载中需要显示的文字
+					background: 'rgba(0,0,0,.7)' // 背景颜色
+				});
+			},
+			// 结束加载动画
+			endLoading() {
+				// clearTimeout(timer);
+				if (loading) {
+					loading.close();
+				}
 			}
 		},
-		resetData() {
-			this.searchValue = '';
-			this.searchOptions = [];
-			this.resultList = [];
-			this.neighborHoodId = ''; //小区ID
-			this.dataForm = {
-				neighborHoodName: '', // 小区名称【不超过50字】
-				agencyId: '', // 所属组织ID
-				agencyName: '',
-				gridId: '', //所属网格ID
-				propertyId: '', //关联物业
-				address: '', //详细地址
-				remark: '', //备注【最大500字】
-				location: '', //坐标位置
-				longitude: '', //经度
-				latitude: '', //纬度
-				realBuilding: 0,
-				coding: '',
-				sysCoding: '',
-				viliageType: '',
-				area: '',
-				openType: '',
-				buildYear: '',
-				
-			};
-			this.propertyFormShow = false;
-		},
-		// 开启加载动画
-		startLoading() {
-			loading = Loading.service({
-				lock: true, // 是否锁定
-				text: '正在加载……', // 加载中需要显示的文字
-				background: 'rgba(0,0,0,.7)' // 背景颜色
-			});
-		},
-		// 结束加载动画
-		endLoading() {
-			// clearTimeout(timer);
-			if (loading) {
-				loading.close();
-			}
-		}
-	},
-	computed: {
-		dataRule() {
-			return {
-				neighborHoodName: [
-					{ required: true, message: '小区名称不能为空', trigger: 'blur' },
-					{
+		computed: {
+			dataRule() {
+				return {
+					neighborHoodName: [{
+						required: true,
+						message: '小区名称不能为空',
+						trigger: 'blur'
+					}, {
 						min: 1,
 						max: 50,
 						message: '小区名称长度在 1 到 50个字符',
 						trigger: 'blur'
+					}],
+					agencyId: [{
+						required: true,
+						message: '所属组织不能为空',
+						trigger: 'blur'
+					}],
+					gridId: [{
+						required: true,
+						message: '所属网格不能为空',
+						trigger: 'blur'
+					}],
+					coding: [{
+						required: true,
+						message: '小区编码不能为空',
+						trigger: 'blur'
+					}],
+					address: [{
+						required: true,
+						message: '详细地址不能为空',
+						trigger: 'blur'
+					}],
+					longitude: [{
+						required: true,
+						message: '坐标不能为空',
+						trigger: 'blur'
+					}]
+				};
+			},
+			propertyRule() {
+				name: [{
+						required: true,
+						message: '物业名称不能为空',
+						trigger: 'blur'
 					}
-				],
-				agencyId: [{ required: true, message: '所属组织不能为空', trigger: 'blur' }],
-				gridId: [{ required: true, message: '所属网格不能为空', trigger: 'blur' }],
-				coding: [{ required: true, message: '小区编码不能为空', trigger: 'blur' }],
-				address: [{ required: true, message: '详细地址不能为空', trigger: 'blur' }],
-				longitude: [{ required: true, message: '坐标不能为空', trigger: 'blur' }]
-			};
+					// { min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
+				];
+			}
 		},
-		propertyRule() {
-			name: [
-				{ required: true, message: '物业名称不能为空', trigger: 'blur' }
-				// { min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
-			];
-		}
-	},
-	props: {}
-};
+		props: {}
+	};
 </script>
 <style lang="scss" scoped>
-@import '@/assets/scss/modules/visual/communityManageForm.scss';
-</style>
+	@import '@/assets/scss/modules/visual/communityManageForm.scss';
+</style>
\ No newline at end of file