From 9b4e63a658521186b38a77b062ab78dbf39da181 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 29 Nov 2021 09:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regionalParty/activitys.vue               |  35 +-
 .../regionalParty/activitysDetail.vue         | 302 ++++++++++++++++++
 .../communityParty/regionalParty/units.vue    |  64 ++--
 .../regionalParty/unitsDetail.vue             | 271 ++++++++++++++++
 .../ninePlaces/inspect/inspect.vue            |  12 +-
 .../ninePlaces/places/places.vue              |  13 +-
 .../communityService/ninePlaces/team/team.vue |  12 +-
 7 files changed, 665 insertions(+), 44 deletions(-)
 create mode 100644 src/views/modules/communityParty/regionalParty/activitysDetail.vue
 create mode 100644 src/views/modules/communityParty/regionalParty/unitsDetail.vue

diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index e31257f5..2e548478 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -11,6 +11,7 @@
                         prop="unitId">
             <el-select class="item_width_1"
                        v-model="formData.unitId"
+                       size="small"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in unitList"
@@ -26,6 +27,7 @@
                         prop="serviceMatter">
             <el-select class="item_width_2"
                        v-model="formData.serviceMatter"
+                       size="small"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in serviceList"
@@ -42,6 +44,7 @@
           <el-form-item label="活动标题"
                         prop="title">
             <el-input v-model="formData.title"
+                      size="small"
                       class="item_width_1"
                       clearable
                       placeholder="请输入内容">
@@ -52,6 +55,7 @@
           <el-form-item label="活动时间"
                         prop="startTime">
             <el-date-picker v-model="timeRange"
+                            size="small"
                             type="daterange"
                             value-format="yyyy-MM-dd HH:mm:ss"
                             @change="handleTimeChange"
@@ -63,9 +67,11 @@
           </el-form-item>
           <el-button style="margin-left:10px"
                      type="primary"
+                     size="small"
                      @click="handleSearch">查询</el-button>
           <el-button style="margin-left:10px"
                      type="yellow"
+                     size="small"
                      @click="resetSearch">重置</el-button>
         </div>
       </el-form>
@@ -193,6 +199,16 @@
                       @dialogCancle="addFormCancle"
                       @dialogOk="addFormOk"></activitys-form>
     </el-dialog>
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'活动详情'"
+               width="950px"
+               top="5vh"
+               @closed="detailClosed">
+      <activitys-detail ref="ref_detail"
+                        :serviceList="serviceList"></activitys-detail>
+    </el-dialog>
 
   </div>
 </template>
@@ -200,6 +216,7 @@
 <script>
 
 import activitysForm from './activitysForm'
+import activitysDetail from './activitysDetail'
 import util from '@js/util.js';
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
@@ -255,6 +272,7 @@ export default {
       //form相关
       formShow: false,
       formTitle: '新增单位',
+      detailShow: false,
 
       files: "",
       fileName: "",
@@ -263,7 +281,7 @@ export default {
     }
   },
   components: {
-    activitysForm
+    activitysForm, activitysDetail
   },
   async created () {
 
@@ -355,11 +373,14 @@ export default {
       this.formShow = false
     },
 
+    detailClosed () {
+      this.detailShow = false
+    },
+
     handleDetail (row) {
-      this.formTitle = '详情'
-      this.formShow = true
+      this.detailShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row.id)
+        this.$refs.ref_detail.initForm(row)
       })
     },
 
@@ -618,7 +639,7 @@ export default {
 .div_search {
   background: #ffffff;
   border-radius: 4px;
-  padding: 35px 20px;
+  padding: 30px 20px 5px;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
 }
 
@@ -626,14 +647,14 @@ export default {
   width: 260px;
 }
 .item_width_2 {
-  width: 520px;
+  width: 495px;
 }
 
 .div_table {
   background: #ffffff;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
-  margin-top: 20px;
+  margin-top: 15px;
   padding: 23px 30px 10px;
 
   .table {
diff --git a/src/views/modules/communityParty/regionalParty/activitysDetail.vue b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
new file mode 100644
index 00000000..d635d56b
--- /dev/null
+++ b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
@@ -0,0 +1,302 @@
+<template>
+  <div>
+    <div>
+      <div>
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="formData"
+                 class="form">
+
+          <el-form-item label="服务事项"
+                        label-width="150px"
+                        prop="serviceMatterShow">
+            <span class="detail_span">{{formData.serviceMatterShow}}</span>
+
+          </el-form-item>
+
+          <el-form-item label="单位名称"
+                        prop="unitId"
+                        label-width="150px"
+                        style="display: block">
+            <span class="detail_span">{{formData.unitName}}</span>
+
+          </el-form-item>
+
+          <el-form-item label="活动标题"
+                        prop="title"
+                        label-width="150px"
+                        style="display: block">
+            <span class="detail_span">{{formData.title}}</span>
+
+          </el-form-item>
+
+          <el-form-item label="活动目标"
+                        prop="target"
+                        label-width="150px"
+                        style="display: block">
+            <span class="detail_span">{{formData.target}}</span>
+
+          </el-form-item>
+          <el-form-item label="活动内容"
+                        prop="target"
+                        label-width="150px"
+                        style="display: block">
+            <p class="text_p"
+               v-html="formData.content"></p>
+
+          </el-form-item>
+
+          <el-form-item label="服务人数"
+                        style="display: block"
+                        prop="peopleCount"
+                        label-width="150px">
+            <span class="detail_span">{{formData.peopleCount}}</span>
+
+          </el-form-item>
+          <el-form-item label="活动时间"
+                        style="display: block"
+                        prop="activityTime"
+                        label-width="150px">
+            <span class="detail_span">{{formData.activityTime}}</span>
+
+          </el-form-item>
+
+          <el-form-item label="活动地址"
+                        prop="address"
+                        label-width="150px"
+                        style="display: block">
+            <span class="detail_span">{{formData.address}}</span>
+
+          </el-form-item>
+
+          <el-form-item label="活动坐标"
+                        prop="longitude"
+                        label-width="150px"
+                        style="display: block">
+
+            <div style="width:500px">
+
+              <div id="app">
+
+              </div>
+
+            </div>
+
+          </el-form-item>
+
+          <el-form-item label="活动结果"
+                        prop="result"
+                        label-width="150px"
+                        style="display: block">
+
+            <p class="text_p"
+               v-html="formData.result"></p>
+
+          </el-form-item>
+        </el-form>
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formData: {},
+    }
+  },
+  components: {},
+  mounted () {
+    this.initMap()
+  },
+
+  methods: {
+
+    async initForm (row) {
+
+      this.startLoading()
+      for (let item of this.serviceList) {
+
+        if (row.serviceMatter === item.value) {
+          row.serviceMatterShow = item.label
+        }
+      }
+      this.formData = { ...row }
+
+      map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+      this.setMarker(this.formData.latitude, this.formData.longitude)
+
+      this.endLoading()
+
+    },
+
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById('app'), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45 // 设置地图旋转角度
+      })
+
+      search = new window.TMap.service.Search({ pageSize: 10 })
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: []
+      })
+      infoWindowList = Array(10)
+
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map.on('panend', () => {
+        this.handleMoveCenter()
+      })
+      this.handleMoveCenter()
+      this.convert()
+    },
+
+    setMarker (lat, lng) {
+      markers.setGeometries([])
+      markers.add([
+        {
+          id: '4',
+          styleId: 'marker',
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: 'marker4'
+          }
+        }
+      ])
+    },
+
+    handleSearchMap () {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close()
+      })
+      infoWindowList.length = 0
+      markers.setGeometries([])
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.keyWords,
+          bounds: map.getBounds()
+        })
+        .then((result) => {
+          let { data } = result
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng }
+            } = data[0]
+
+
+            map.setCenter(new TMap.LatLng(lat, lng))
+            this.setMarker(lat, lng)
+            this.formData.latitude = lat
+            this.formData.longitude = lng
+            this.convert()
+          } else {
+            this.$message.error('未检索到相关位置坐标')
+          }
+        })
+    },
+
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter()
+      const lat = center.getLat()
+      const lng = center.getLng()
+      this.formData.latitude = lat
+      this.formData.longitude = lng
+      this.setMarker(lat, lng)
+      this.convert(lat, lng)
+    },
+
+    convert (lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(',');
+      let location
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+      }
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: 'main', // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+          // this.formData.address = result.result.address
+          // 显示搜索到的地址
+        });
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {},
+  props: {
+    serviceList: {
+      type: Array,
+      default: []
+    },
+  }
+}
+</script>
+<style  lang="scss" scoped>
+.detail_span {
+  width: 500px;
+  font-weight: bold;
+  text-align: left;
+  margin: 0 0;
+  font-size: 16px;
+}
+.text_p {
+  margin: 0 0;
+  border: 3px;
+
+  > p {
+    margin: 0 0;
+  }
+}
+
+.div_map {
+  position: relative;
+}
+</style>
+
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index ce93f05a..63253148 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -12,6 +12,7 @@
             <el-input v-model="formData.unitName"
                       class="item_width_1"
                       clearable
+                      size="small"
                       placeholder="请输入内容">
             </el-input>
 
@@ -21,6 +22,7 @@
             <el-select class="item_width_2"
                        v-model="formData.serviceMatter"
                        placeholder="请选择"
+                       size="small"
                        clearable>
               <el-option v-for="item in serviceList"
                          :key="item.value"
@@ -37,6 +39,7 @@
             <el-select class="item_width_1"
                        v-model="formData.type"
                        placeholder="请选择"
+                       size="small"
                        clearable>
               <el-option v-for="item in typeList"
                          :key="item.value"
@@ -50,6 +53,7 @@
                         prop="contact">
             <el-input v-model="formData.contact"
                       class="item_width_1"
+                      size="small"
                       clearable
                       placeholder="请输入内容">
             </el-input>
@@ -60,6 +64,7 @@
                         prop="contactMobile">
             <el-input v-model="formData.contactMobile"
                       class="item_width_1"
+                      size="small"
                       clearable
                       placeholder="请输入内容">
             </el-input>
@@ -68,9 +73,11 @@
 
           <el-button style="margin-left:10px"
                      type="primary"
+                     size="small"
                      @click="handleSearch">查询</el-button>
           <el-button style="margin-left:10px"
                      type="yellow"
+                     size="small"
                      @click="resetSearch">重置</el-button>
         </div>
       </el-form>
@@ -81,6 +88,10 @@
                    type="green"
                    size="small"
                    @click="handleAdd">新增</el-button>
+        <el-button style="float:left"
+                   type="yellow"
+                   size="small"
+                   @click="handleExport">导出</el-button>
         <el-upload ref="upload"
                    :multiple='false'
                    :show-file-list='false'
@@ -94,11 +105,6 @@
                      size="small"
                      type="red">导入</el-button>
 
-          <el-button style="float:left"
-                     type="yellow"
-                     size="small"
-                     @click="handleExport">导出</el-button>
-
         </el-upload>
 
       </div>
@@ -145,7 +151,7 @@
                          header-align="center"
                          align="center"
                          label="联系人"
-                         width="100">
+                         width="80">
         </el-table-column>
         <el-table-column prop="contactMobile"
                          header-align="center"
@@ -222,6 +228,15 @@
                   @dialogCancle="addFormCancle"
                   @dialogOk="addFormOk"></units-form>
     </el-dialog>
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'单位详情'"
+               width="950px"
+               top="5vh"
+               @closed="detailClosed">
+      <units-detail ref="ref_detail"></units-detail>
+    </el-dialog>
 
   </div>
 </template>
@@ -229,6 +244,7 @@
 <script>
 
 import unitsForm from './unitsForm'
+import unitsDetail from './unitsDetail'
 
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
@@ -268,7 +284,6 @@ export default {
 
       unitId: '',
       formData: {
-
         unitName: '',
         serviceMatter: '',
         type: '',
@@ -281,6 +296,7 @@ export default {
       //form相关
       formShow: false,
       formTitle: '新增单位',
+      detailShow: false,
 
       files: "",
       fileName: "",
@@ -289,7 +305,7 @@ export default {
     }
   },
   components: {
-    unitsForm
+    unitsForm, unitsDetail
   },
   async created () {
 
@@ -367,14 +383,7 @@ export default {
       if (code === 0) {
         this.total = data.total
         this.tableData = data.list
-        // this.tableData.forEach(item => {
-        //   item.serviceMatterShow = ''
-        //   if (item.serviceMatterList.length > 0) {
-        //     item.serviceMatterShow = item.serviceMatterList.join('')
-
-        //   }
 
-        // });
       } else {
         this.$message.error(msg)
       }
@@ -387,18 +396,20 @@ export default {
       this.$refs.ref_form.resetData()
       this.formShow = false
     },
+    detailClosed () {
+      this.detailShow = false
+    },
 
     handleDetail (row) {
-      this.formTitle = '详情'
-      this.formShow = true
+      this.detailShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row.id)
+        this.$refs.ref_detail.initForm(row)
       })
     },
 
     handleAdd () {
       this.formTitle = '新增'
-      this.formShow = true
+      this.formShow = 'edit'
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('add', null)
       })
@@ -476,13 +487,10 @@ export default {
     async handleExport () {
       let title = '联建单位列表'
 
-
-      const url = "/partyunit/export"
+      const url = "/heart/icpartyunit/export"
       let params = {
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        level: this.agencyObj.level,
-        id: this.agencyObj.id
+        agencyId: this.agencyId,
+        ...this.formData
       }
 
       app.ajax.exportFilePost(
@@ -557,7 +565,7 @@ export default {
       //清空上传列表
       this.$refs['upload'].clearFiles()
 
-      var url = '/partyunit/import'
+      var url = '/heart/icpartyunit/import'
       let fileFormData = new FormData();
       fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
 
@@ -631,7 +639,7 @@ export default {
 .div_search {
   background: #ffffff;
   border-radius: 4px;
-  padding: 35px 20px;
+  padding: 30px 20px 5px;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
 }
 
@@ -646,7 +654,7 @@ export default {
   background: #ffffff;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
-  margin-top: 20px;
+  margin-top: 15px;
   padding: 23px 30px 10px;
 
   .table {
diff --git a/src/views/modules/communityParty/regionalParty/unitsDetail.vue b/src/views/modules/communityParty/regionalParty/unitsDetail.vue
new file mode 100644
index 00000000..12e58549
--- /dev/null
+++ b/src/views/modules/communityParty/regionalParty/unitsDetail.vue
@@ -0,0 +1,271 @@
+<template>
+  <div>
+
+    <el-form ref="ref_form"
+             :inline="true"
+             :model="formData"
+             class="form">
+
+      <el-form-item label="单位名称："
+                    prop="unitName"
+                    label-width="150px"
+                    style="display: block">
+        <span class="detail_span">{{formData.unitName}}</span>
+
+      </el-form-item>
+      <el-form-item label="分类："
+                    prop="type"
+                    label-width="150px"
+                    style="display: block">
+
+        <span class="detail_span">{{formData.type}}</span>
+
+      </el-form-item>
+      <el-form-item label="服务事项："
+                    prop="serviceMatterList"
+                    label-width="150px"
+                    style="display: block">
+        <p class="detail_span"
+           v-for="(item,index) in formData.serviceMatterList"
+           :key="index">{{item}}</p>
+
+      </el-form-item>
+      <el-form-item label="联系人："
+                    prop="contact"
+                    label-width="150px"
+                    style="display: block">
+        <span class="detail_span">{{formData.contact}}</span>
+
+      </el-form-item>
+      <el-form-item label="联系电话："
+                    prop="contactMobile"
+                    label-width="150px"
+                    style="display: block">
+        <span class="detail_span">{{formData.contactMobile}}</span>
+      </el-form-item>
+      <el-form-item label="在职党员："
+                    style="display: block"
+                    prop="memberCount"
+                    label-width="150px">
+        <span class="detail_span">{{formData.memberCount}}</span>
+      </el-form-item>
+      <el-form-item label="备注："
+                    prop="remark"
+                    label-width="150px"
+                    style="display: block">
+        <span class="detail_span">{{formData.remark?formData.remark:'无'}}</span>
+      </el-form-item>
+      <el-form-item label="地理位置："
+                    prop="address"
+                    label-width="150px"
+                    style="display: block">
+        <span class="detail_span">{{formData.address}}</span>
+
+      </el-form-item>
+      <el-form-item label="位置坐标："
+                    prop="longitude"
+                    label-width="150px"
+                    style="display: block">
+        <div style="width:500px">
+
+          <div id="app">
+
+          </div>
+
+        </div>
+      </el-form-item>
+
+    </el-form>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formData: {},
+
+    }
+  },
+  components: {},
+  mounted () {
+    this.initMap()
+  },
+
+  methods: {
+
+    async initForm (row) {
+      this.startLoading()
+      this.formData = { ...row }
+      map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+      this.setMarker(this.formData.latitude, this.formData.longitude)
+
+      this.endLoading()
+
+    },
+
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById('app'), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45 // 设置地图旋转角度
+      })
+
+      search = new window.TMap.service.Search({ pageSize: 10 })
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: []
+      })
+      infoWindowList = Array(10)
+
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map.on('panend', () => {
+        this.handleMoveCenter()
+      })
+      this.handleMoveCenter()
+      this.convert()
+    },
+
+    setMarker (lat, lng) {
+      markers.setGeometries([])
+      markers.add([
+        {
+          id: '4',
+          styleId: 'marker',
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: 'marker4'
+          }
+        }
+      ])
+    },
+
+    handleSearchMap () {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close()
+      })
+      infoWindowList.length = 0
+      markers.setGeometries([])
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.keyWords,
+          bounds: map.getBounds()
+        })
+        .then((result) => {
+          let { data } = result
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng }
+            } = data[0]
+
+
+            map.setCenter(new TMap.LatLng(lat, lng))
+            this.setMarker(lat, lng)
+            this.formData.latitude = lat
+            this.formData.longitude = lng
+            this.convert()
+          } else {
+            this.$message.error('未检索到相关位置坐标')
+          }
+        })
+    },
+
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter()
+      const lat = center.getLat()
+      const lng = center.getLng()
+      this.formData.latitude = lat
+      this.formData.longitude = lng
+      this.setMarker(lat, lng)
+      this.convert(lat, lng)
+    },
+
+    convert (lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(',');
+      let location
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+      }
+
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: 'main', // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+          // this.formData.address = result.result.address
+          // 显示搜索到的地址
+        });
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+  },
+  props: {
+
+  }
+}
+</script>
+
+<style scoped>
+.detail_span {
+  width: 500px;
+  font-weight: bold;
+  text-align: left;
+  margin: 0 0;
+  font-size: 16px;
+}
+
+.div_map {
+  position: relative;
+}
+
+.form {
+  margin-top: 30px;
+}
+</style>
+
+
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index 9d433ea1..040a91b9 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -10,6 +10,7 @@
           <el-form-item label="场所名称"
                         prop="placeOrgName">
             <el-input v-model="formData.placeOrgName"
+                      size="small"
                       class="item_width_1"
                       clearable
                       placeholder="请输入九小场所名称">
@@ -21,6 +22,7 @@
                         prop="firstResult">
             <el-select class="item_width_1"
                        v-model="formData.firstResult"
+                       size="small"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in resultList"
@@ -53,6 +55,7 @@
                         prop="ninePlaceVal">
             <el-select class="item_width_1"
                        v-model="formData.ninePlaceVal"
+                       size="small"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in placeTypeList"
@@ -68,6 +71,7 @@
                         prop="finalResult">
             <el-select class="item_width_1"
                        v-model="formData.finalResult"
+                       size="small"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in resultList"
@@ -78,10 +82,12 @@
             </el-select>
           </el-form-item>
 
-          <el-button style="margin-left:10px"
+          <el-button style="margin-left:30px"
+                     size="small"
                      type="primary"
                      @click="handleSearch">查询</el-button>
           <el-button style="margin-left:10px"
+                     size="small"
                      type="yellow"
                      @click="resetSearch">重置</el-button>
         </div>
@@ -544,7 +550,7 @@ export default {
 .div_search {
   background: #ffffff;
   border-radius: 4px;
-  padding: 35px 20px;
+  padding: 30px 20px 5px;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
 }
 
@@ -556,7 +562,7 @@ export default {
   background: #ffffff;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
-  margin-top: 20px;
+  margin-top: 15px;
   padding: 23px 30px 10px;
 
   .table {
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index a9527929..9993f597 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -10,6 +10,7 @@
           <el-form-item label="场所名称"
                         prop="placeOrgName">
             <el-input v-model="formData.placeOrgName"
+                      size="small"
                       class="item_width_1"
                       clearable
                       placeholder="请输入九小场所名称">
@@ -20,6 +21,7 @@
           <el-form-item label="联系电话"
                         prop="mobile">
             <el-input v-model="formData.mobile"
+                      size="small"
                       class="item_width_1"
                       clearable
                       placeholder="请输入电话">
@@ -31,6 +33,7 @@
                         prop="gridId">
             <el-select class="item_width_1"
                        v-model="formData.gridId"
+                       size="small"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in gridList"
@@ -47,6 +50,7 @@
           <el-form-item label="规模"
                         prop="scale">
             <el-select class="item_width_1"
+                       size="small"
                        v-model="formData.scale"
                        placeholder="请选择"
                        clearable>
@@ -61,6 +65,7 @@
           <el-form-item label="场所类型"
                         prop="ninePlaceVal">
             <el-select class="item_width_1"
+                       size="small"
                        v-model="formData.ninePlaceVal"
                        placeholder="请选择"
                        clearable>
@@ -73,10 +78,12 @@
 
           </el-form-item>
 
-          <el-button style="margin-left:10px"
+          <el-button style="margin-left:30px"
+                     size="small"
                      type="primary"
                      @click="handleSearch">查询</el-button>
           <el-button style="margin-left:10px"
+                     size="small"
                      type="yellow"
                      @click="resetSearch">重置</el-button>
         </div>
@@ -479,7 +486,7 @@ export default {
 .div_search {
   background: #ffffff;
   border-radius: 4px;
-  padding: 35px 20px;
+  padding: 30px 20px 5px;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
 }
 
@@ -491,7 +498,7 @@ export default {
   background: #ffffff;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
-  margin-top: 20px;
+  margin-top: 15px;
   padding: 23px 30px 10px;
 
   .table {
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index 8f73d6e5..6788b39c 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -10,6 +10,7 @@
           <el-form-item label="负责人"
                         prop="personInCharge">
             <el-input v-model="formData.personInCharge"
+                      size="small"
                       class="item_width_1"
                       clearable
                       placeholder="请输入负责人姓名">
@@ -20,6 +21,7 @@
           <el-form-item label="联系电话"
                         prop="mobile">
             <el-input v-model="formData.mobile"
+                      size="small"
                       class="item_width_1"
                       clearable
                       placeholder="请输入电话">
@@ -32,6 +34,7 @@
                         prop="gridId">
             <el-select class="item_width_1"
                        v-model="formData.gridId"
+                       size="small"
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in gridList"
@@ -46,6 +49,7 @@
           <el-form-item label="场所类型"
                         prop="ninePlaceVal">
             <el-select class="item_width_1"
+                       size="small"
                        v-model="formData.ninePlaceVal"
                        placeholder="请选择"
                        clearable>
@@ -58,10 +62,12 @@
 
           </el-form-item>
 
-          <el-button style="margin-left:10px"
+          <el-button style="margin-left:30px"
+                     size="small"
                      type="primary"
                      @click="handleSearch">查询</el-button>
           <el-button style="margin-left:10px"
+                     size="small"
                      type="yellow"
                      @click="resetSearch">重置</el-button>
         </div>
@@ -454,7 +460,7 @@ export default {
 .div_search {
   background: #ffffff;
   border-radius: 4px;
-  padding: 35px 20px;
+  padding: 30px 20px 5px;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
 }
 
@@ -466,7 +472,7 @@ export default {
   background: #ffffff;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
-  margin-top: 20px;
+  margin-top: 15px;
   padding: 23px 30px 10px;
 
   .table {