From d9f4fc0f6adc1510b8089de76962f8c4c409278c Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 24 Oct 2022 15:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=9B=BE=E5=B1=82=E8=B0=83?=
 =?UTF-8?q?=E6=95=B41?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/sqzzz/cpts/edit.vue      |  57 ++--
 src/views/modules/shequzhili/csgltc/csgl.vue  |   5 +-
 .../modules/shequzhili/csgltc/csglDetail.vue  | 137 ++--------
 .../modules/shequzhili/csgltc/csglForm.vue    | 246 ++++++++----------
 .../modules/shequzhili/ggfwtc/ggfwDetail.vue  | 133 ++--------
 .../modules/shequzhili/ggfwtc/ggfwForm.vue    | 246 +++++++++---------
 6 files changed, 299 insertions(+), 525 deletions(-)

diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue
index a7302d375..6fe29bdf3 100644
--- a/src/views/modules/communityService/sqzzz/cpts/edit.vue
+++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue
@@ -133,16 +133,6 @@
                       label-width="150px"
                       style="display: block">
           <div style="width: 500px">
-            <!-- <el-input class="item_width_4"
-                      maxlength="50"
-                      placeholder="请输入关键字"
-                      v-model="keyWords">
-            </el-input>
-            <el-button style="margin-left: 10px"
-                       type="default"
-                       size="small"
-                       @click="handleSearchMap">查询</el-button> -->
-
             <el-select v-model="searchValue"
                        filterable
                        style="width: 500px"
@@ -160,21 +150,6 @@
             </el-select>
             <div id="app"
                  class="div_map"></div>
-            <!-- <div style="margin-top: 10px"
-                 v-show="false">
-              <span>经度</span>
-              <el-input class="item_width_3"
-                        maxlength="50"
-                        placeholder="请输入经度"
-                        v-model="dataForm.longitude">
-              </el-input>
-              <span style="margin-left: 20px">纬度</span>
-              <el-input class="item_width_3"
-                        maxlength="50"
-                        placeholder="请输入纬度"
-                        v-model="dataForm.latitude">
-              </el-input>
-            </div> -->
           </div>
         </el-form-item>
 
@@ -344,8 +319,8 @@ export default {
       let lonlat = selPosition.lonlat.split(" ")
       map.setCenter(lonlat[1], lonlat[0]);
       map.setMarker(lonlat[1], lonlat[0]);
-      this.dataForm.latitude = lonlat[0];
-      this.dataForm.longitude = lonlat[1];
+      this.formData.latitude = lonlat[1];
+      this.formData.longitude = lonlat[0];
       this.dataForm.address = selPosition.address + selPosition.name
     },
 
@@ -455,19 +430,6 @@ export default {
 
     },
 
-    // async handleSearchMap () {
-    //   const { msg, data } = await map.searchNearby(this.keyWords);
-    //   if (msg == "success") {
-    //     const { lat, lng } = data;
-    //     map.setCenter(lat, lng);
-    //     map.setMarker(lat, lng);
-    //     this.dataForm.latitude = lat;
-    //     this.dataForm.longitude = lng;
-    //     this.handleMoveCenter()
-    //   } else {
-    //     this.$message.error("未检索到相关位置坐标");
-    //   }
-    // },
 
     async handleMoveCenter () {
       //修改地图中心点
@@ -574,6 +536,21 @@ export default {
         organizationPersonnel: [],
       };
     },
+
+    // async handleSearchMap () {
+    //   const { msg, data } = await map.searchNearby(this.keyWords);
+    //   if (msg == "success") {
+    //     const { lat, lng } = data;
+    //     map.setCenter(lat, lng);
+    //     map.setMarker(lat, lng);
+    //     this.dataForm.latitude = lat;
+    //     this.dataForm.longitude = lng;
+    //     this.handleMoveCenter()
+    //   } else {
+    //     this.$message.error("未检索到相关位置坐标");
+    //   }
+    // },
+
     // 开启加载动画
     startLoading () {
       loading = Loading.service({
diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index 8eacbd0ed..e29f1c93a 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -52,7 +52,8 @@
                    style="margin-left:10px"
                    size="small"
                    @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"  ref="upload"
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload"
                    :multiple='false'
                    :show-file-list='false'
                    :before-upload="beforeUpload"
@@ -361,7 +362,7 @@ export default {
       this.formShow = false
     },
     diaDetailClose () {
-      this.$refs.ref_detail.diaDestroy()
+      // this.$refs.ref_detail.diaDestroy()
       this.detailShow = false
 
     },
diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue
index acc1443a2..5efaebe8d 100644
--- a/src/views/modules/shequzhili/csgltc/csglDetail.vue
+++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue
@@ -33,7 +33,7 @@
           </div>
 
           <div class="info-prop">
-            <span class="info-title-2">地理位置：</span>
+            <span class="info-title-2">所在位置：</span>
             <span>{{ formData.address }}</span>
           </div>
 
@@ -41,7 +41,7 @@
             <span class="info-title-2">地图位置：</span>
             <div class="div_map">
 
-              <div id="app_detail"></div>
+              <div id="app_csgl_detail"></div>
 
             </div>
           </div>
@@ -61,6 +61,7 @@
 <script>
 
 import { Loading } from 'element-ui' // 引入Loading服务
+import daiMap from "@/utils/dai-map";
 
 var map
 var search
@@ -85,14 +86,14 @@ export default {
 
   methods: {
     handleCancle () {
-      this.diaDestroy()
+      // this.diaDestroy()
       this.$emit('diaDetailClose')
 
     },
 
     diaDestroy () {
       if (map) {
-        map.destroy()
+        // map.destroy()
       }
     },
 
@@ -100,17 +101,7 @@ export default {
       this.startLoading()
       this.formData = { ...row }
       this.initLoading = true
-      this.$nextTick(() => {
-        this.initMap()
-      })
-      this.endLoading()
-
-    },
-
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
 
-      // 定义地图中心点坐标
       let { latitude, longitude } = this.$store.state.user;
       console.log('lat' + latitude + ',lon' + longitude)
       if (this.formData.latitude && this.formData.longitude) {
@@ -121,115 +112,37 @@ export default {
         latitude = 39.9088810666821;
         longitude = 116.39743841556731;
       }
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(latitude, longitude);
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('app_detail'), {
-        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: []
+      this.$nextTick(() => {
+        this.initMap(latitude, longitude)
       })
-      infoWindowList = Array(10)
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+      this.endLoading()
 
-      // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      // this.convert()
     },
 
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap (latitude, longitude) {
+
+      map = new daiMap(
+        document.getElementById("app_csgl_detail"),
+        { latitude, longitude },
         {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
         }
-      ])
-    },
+      );
 
-    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('未检索到相关位置坐标')
-          }
-        })
-    },
+      // // 监听地图平移结束
+      // map.on("dragend", (e) => {
+      //   this.handleMoveCenter(e);
+      // });
 
-    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(latitude, longitude);
+      map.setMarker(latitude, 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({
diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue
index 854e03e15..7d6035207 100644
--- a/src/views/modules/shequzhili/csgltc/csglForm.vue
+++ b/src/views/modules/shequzhili/csgltc/csglForm.vue
@@ -96,23 +96,42 @@
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
 
-        <el-form-item label="地址"
-                      prop="address"
+        <el-form-item label="地图位置"
+                      prop="longitude"
                       label-width="150px"
                       style="display: block">
-          <div class="item_width_1">
-            <el-input style="width:420px"
-                      :placeholder="'请输入所在地址'"
-                      v-model="formData.address">
-            </el-input>
-            <el-button style="margin-left: 10px"
-                       type="default"
-                       size="small"
-                       @click="handleSearchMap">查询</el-button>
-            <div id="app"
+          <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>
+            <div id="app_csgl"
                  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="formData.address">
+          </el-input>
+        </el-form-item>
       </el-form>
     </div>
 
@@ -132,7 +151,7 @@
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
-
+import daiMap from "@/utils/dai-map";
 
 
 var map
@@ -146,6 +165,10 @@ export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      searchOptions: [],
+      searchValue: '',
+      resultList: [],
+      loading: false,
 
       btnDisable: false,
       serviceList: [],
@@ -169,7 +192,7 @@ export default {
   },
   components: {},
   mounted () {
-    this.initMap()
+
   },
 
   methods: {
@@ -177,7 +200,7 @@ export default {
     async initForm (type, icCityManagementId) {
       this.startLoading()
       this.$refs.ref_form.resetFields();
-
+      let { latitude, longitude } = this.$store.state.user;
       //获取服务事项
       await this.loadService()
 
@@ -187,10 +210,12 @@ export default {
         this.formData.icCityManagementId = icCityManagementId
         await this.loadFormData()
       } else {
-        // map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
-        // this.setMarker(36.0722275, 120.38945519)
+        this.formData.latitude = latitude
+        this.formData.longitude = longitude
       }
-
+      // if (!map) {
+      this.initMap(this.formData.latitude, this.formData.longitude);
+      // }
       this.endLoading()
 
     },
@@ -231,10 +256,10 @@ export default {
         // let { latitude, longitude } = this.$store.state.user;
         // const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude;
         // const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude;
-        if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') {
-          map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
-          this.setMarker(this.formData.latitude, this.formData.longitude)
-        }
+        // if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') {
+        //   map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+        //   this.setMarker(this.formData.latitude, this.formData.longitude)
+        // }
       } else {
         this.$message.error(msg)
       }
@@ -289,133 +314,90 @@ export default {
     },
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
-      let { latitude, longitude } = this.$store.state.user;
-
-      console.log('lat' + latitude + ',lon' + longitude)
-      if (!latitude || latitude == "" || latitude == "0") {
-        latitude = 39.9088810666821;
-        longitude = 116.39743841556731;
-      }
-
-      this.formData.latitude = latitude
-      this.formData.longitude = longitude
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(latitude, longitude);
-      // var center = new window.TMap.LatLng(36.52799, 120.7553)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('app'), {
-        center: center, // 设置地图中心点坐标
-        zoom: 16.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45 // 设置地图旋转角度
-      })
+    initMap (latitude, longitude) {
 
-      search = new window.TMap.service.Search({ pageSize: 10 })
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: []
-      })
-      infoWindowList = Array(10)
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+      map = new daiMap(
+        document.getElementById("app_csgl"),
+        { latitude, longitude },
+        {
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
+        }
+      );
 
       // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      // this.convert()
-    },
+      map.on("dragend", (e) => {
+        this.handleMoveCenter(e);
+      });
 
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
-        {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
-        }
-      ])
-    },
+      map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
 
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close()
-      })
-      infoWindowList.length = 0
-      markers.setGeometries([])
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchNearby({
-          keyword: this.formData.address,
-          radius: 1000,
-          autoExtend: true,
-          center: map.getCenter(),
-        })
-        .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 () {
+
+    async 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)
+      const { lat, lng } = map.getCenter();
+      this.formData.latitude = lat;
+      this.formData.longitude = lng;
+      map.setMarker(lat, lng);
+
+      let { msg, data } = await map.getAddress(lat, lng);
+      if (msg == "success") {
+        this.formData.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) {
 
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
+          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 {
-        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+        this.searchOptions = [];
       }
+    },
 
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: 'main', // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          // this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
-          this.formData.address = this.formData.address !== '' && this.formData.address !== null && (this.formData.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address
-          // 显示搜索到的地址
-        });
+    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.formData.latitude = lonlat[1];
+      this.formData.longitude = lonlat[0];
+      this.formData.address = selPosition.address + selPosition.name
     },
 
 
     resetData () {
+      this.searchValue = ''
+      this.searchOptions = []
+      this.resultList = []
       this.unitId = ''
       this.keyWords = ''
       this.formData = {
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
index e1a66f803..28870fb71 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
@@ -42,7 +42,7 @@
             <span class="info-title-2">地图位置：</span>
             <div class="div_map">
 
-              <div id="app_detail"></div>
+              <div id="app_ggfw_detail"></div>
 
             </div>
           </div>
@@ -62,6 +62,7 @@
 <script>
 
 import { Loading } from 'element-ui' // 引入Loading服务
+import daiMap from "@/utils/dai-map";
 
 var map
 var search
@@ -86,14 +87,14 @@ export default {
 
   methods: {
     handleCancle () {
-      this.diaDestroy()
+      // this.diaDestroy()
       this.$emit('diaDetailClose')
 
     },
 
     diaDestroy () {
       if (map) {
-        map.destroy()
+        // map.destroy()
       }
     },
 
@@ -101,15 +102,7 @@ export default {
       this.startLoading()
       this.formData = { ...row }
       this.initLoading = true
-      this.$nextTick(() => {
-        this.initMap()
-      })
-      this.endLoading()
 
-    },
-
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
       let { latitude, longitude } = this.$store.state.user;
       console.log('lat' + latitude + ',lon' + longitude)
       if (this.formData.latitude && this.formData.longitude) {
@@ -120,116 +113,38 @@ export default {
         latitude = 39.9088810666821;
         longitude = 116.39743841556731;
       }
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(latitude, longitude);
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('app_detail'), {
-        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: []
+      this.$nextTick(() => {
+        this.initMap(latitude, longitude)
       })
-      infoWindowList = Array(10)
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+      this.endLoading()
 
-      // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      console.log('initMap')
-      // this.convert()
     },
 
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap (latitude, longitude) {
+
+      map = new daiMap(
+        document.getElementById("app_ggfw_detail"),
+        { latitude, longitude },
         {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
         }
-      ])
-    },
-
-    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)
-    },
+      // // 监听地图平移结束
+      // map.on("dragend", (e) => {
+      //   this.handleMoveCenter(e);
+      // });
 
-    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(latitude, longitude);
+      map.setMarker(latitude, 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({
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
index c4b6d3bdc..3d77b9041 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
@@ -77,23 +77,42 @@
                     class="item_width_1"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
-        <el-form-item label="地址"
-                      prop="address"
+        <el-form-item label="地图位置"
+                      prop="longitude"
                       label-width="150px"
                       style="display: block">
-          <div class="item_width_1">
-            <el-input style="width:420px"
-                      :placeholder="'请输入所在地址'"
-                      v-model="formData.address">
-            </el-input>
-            <el-button style="margin-left: 10px"
-                       type="default"
-                       size="small"
-                       @click="handleSearchMap">查询</el-button>
-            <div id="app"
+          <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>
+            <div id="app_ggfw"
                  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="formData.address">
+          </el-input>
+        </el-form-item>
       </el-form>
     </div>
 
@@ -113,7 +132,7 @@
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
-
+import daiMap from "@/utils/dai-map";
 
 
 var map
@@ -127,11 +146,15 @@ export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      searchOptions: [],
+      searchValue: '',
+      resultList: [],
+      loading: false,
 
       btnDisable: false,
 
       icPublicServiceId: '',
-      keyWords: '',
+
       formData: {
         name: '',//场所名称
         category: '',
@@ -149,7 +172,7 @@ export default {
   },
   components: {},
   mounted () {
-    this.initMap()
+
   },
 
   methods: {
@@ -157,7 +180,7 @@ export default {
     async initForm (type, icPublicServiceId) {
       this.startLoading()
       this.$refs.ref_form.resetFields();
-
+      let { latitude, longitude } = this.$store.state.user;
       //获取服务事项
       await this.loadService()
 
@@ -167,10 +190,13 @@ export default {
         this.formData.icPublicServiceId = icPublicServiceId
         await this.loadFormData()
       } else {
-        // map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
-        // this.setMarker(36.0722275, 120.38945519)
+        this.formData.latitude = latitude
+        this.formData.longitude = longitude
       }
 
+      // if (!map) {
+      this.initMap(this.formData.latitude, this.formData.longitude);
+      // }
       this.endLoading()
 
     },
@@ -211,10 +237,10 @@ export default {
         // let { latitude, longitude } = this.$store.state.user;
         // const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
         // const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
-        if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') {
-          map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
-          this.setMarker(this.formData.latitude, this.formData.longitude)
-        }
+        // if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') {
+        //   map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+        //   this.setMarker(this.formData.latitude, this.formData.longitude)
+        // }
       } else {
         this.$message.error(msg)
       }
@@ -270,130 +296,90 @@ export default {
     },
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      let { latitude, longitude } = this.$store.state.user;
-      console.log('lat' + latitude + ',lon' + longitude)
-      if (!latitude || latitude == "" || latitude == "0") {
-        latitude = 39.9088810666821;
-        longitude = 116.39743841556731;
-      }
-      this.formData.latitude = latitude
-      this.formData.longitude = longitude
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(latitude, longitude);
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('app'), {
-        center: center, // 设置地图中心点坐标
-        zoom: 16.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45 // 设置地图旋转角度
-      })
-
-      search = new window.TMap.service.Search({ pageSize: 10 })
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: []
-      })
-      infoWindowList = Array(10)
+    initMap (latitude, longitude) {
 
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+      map = new daiMap(
+        document.getElementById("app_ggfw"),
+        { latitude, longitude },
+        {
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
+        }
+      );
 
       // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      // this.convert()
-    },
+      map.on("dragend", (e) => {
+        this.handleMoveCenter(e);
+      });
 
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
-        {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
-        }
-      ])
-    },
+      map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
 
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close()
-      })
-      infoWindowList.length = 0
-      markers.setGeometries([])
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchNearby({
-          keyword: this.formData.address,
-          radius: 1000,
-          autoExtend: true,
-          center: map.getCenter(),
-        })
-        .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 () {
+
+    async 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)
+      const { lat, lng } = map.getCenter();
+      this.formData.latitude = lat;
+      this.formData.longitude = lng;
+      map.setMarker(lat, lng);
+
+      let { msg, data } = await map.getAddress(lat, lng);
+      if (msg == "success") {
+        this.formData.address = data.address
+        this.searchValue = data.address
+        this.searchOptions = []
+
+      }
     },
 
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
+    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 {
-        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+        this.searchOptions = [];
       }
-
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: 'main', // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          console.log(this.formData)
-          // this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
-          this.formData.address = this.formData.address !== '' && this.formData.address !== null && (this.formData.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address
-          // 显示搜索到的地址
-        });
     },
 
+    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.formData.latitude = lonlat[1];
+      this.formData.longitude = lonlat[0];
+      this.formData.address = selPosition.address + selPosition.name
+    },
 
     resetData () {
+      this.searchValue = ''
+      this.searchOptions = []
+      this.resultList = []
       this.icPublicServiceId = ''
       this.keyWords = ''
       this.formData = {