From bb13a6e34e65e3651d339583bb329b88f1792cd8 Mon Sep 17 00:00:00 2001
From: zhoulinf <2507241354@qq.com>
Date: Thu, 19 Jun 2025 19:55:32 +0800
Subject: [PATCH] =?UTF-8?q?task#6524=20=E8=8E=B7=E5=8F=96=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E5=9F=8E=E5=B8=82=EF=BC=8C=E6=97=B6=E9=97=B4=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=BD=93=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/addressMap.vue  | 13 ++++++++++---
 src/views/report/reportIndex.vue |  2 ++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/report/addressMap.vue b/src/views/report/addressMap.vue
index c21bc175..1217ce23 100644
--- a/src/views/report/addressMap.vue
+++ b/src/views/report/addressMap.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-  import { searchFun } from '@/utils/map'
+  import { searchFun, getLocal, getAddress } from '@/utils/map'
   export default {
     name: "addressMap",
     data() {
@@ -31,6 +31,7 @@
         activeIndex: '',
         map: '',
         marker: null,
+        cityCode: ''
       }
     },
     watch: {
@@ -43,16 +44,22 @@
       await this.initMap()
     },
     methods: {
-      initMap() {   // 初始化地图
+      async initMap() {   // 初始化地图
         this.map = new AMap.Map('mapId', {
           viewMode: '2D',  // 默认使用 2D 模式
           zoom:11,  //初始化地图层级
         })
+        let res = await getLocal(this.map);
+        let lnglat = new AMap.LngLat(res?.lng, res?.lat);
+        let location = await getAddress(this.map, lnglat)
+        this.cityCode = location?.regeocode.addressComponent.adcode
+        //location?.regeocode?.addressComponent?.city || location?.regeocode?.addressComponent?.province
+        console.log('location', location);
       },
       async searchHandler() {
         this.activeIndex = null
         if( this.keyword ) {
-          this.addressList = await searchFun(this.map, '', this.keyword)
+          this.addressList = await searchFun(this.map,  this.cityCode, this.keyword,)
           this.addressList = this.addressList.filter(item => !!item.location)
         } else {
           this.addressList = []
diff --git a/src/views/report/reportIndex.vue b/src/views/report/reportIndex.vue
index 8e5917f2..008ca2a3 100644
--- a/src/views/report/reportIndex.vue
+++ b/src/views/report/reportIndex.vue
@@ -116,6 +116,7 @@
         v-if="showDatetime"
         v-model="appointTime"
         type="datetime"
+        :min-date="minDate"
         @confirm="onConfirm"
         @cancel="showDatetime = false"
       />
@@ -140,6 +141,7 @@
         remark: '',
         showDatetime: false,
         appointTime: '',
+        minDate: new Date(),
         address: '',
         lat: '',
         lng: '',