From 5d0c0564491406928912ec22346280c38bba8ec4 Mon Sep 17 00:00:00 2001
From: zuqijia <2924963185@qq.com>
Date: Thu, 16 Apr 2026 16:22:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=87=BA=E5=B7=AE?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=9C=B0=E9=AB=98=E5=BE=B7=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD=EF=BC=882=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HrmTravelReqController.java    |  9 +++++++-
 ruoyi-ui/src/api/hrm/travel.js                |  7 ++++++
 .../src/components/AmapCitySelect/index.vue   | 22 +++++++++++++------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmTravelReqController.java b/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmTravelReqController.java
index 0dce55d..2476c0b 100644
--- a/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmTravelReqController.java
+++ b/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmTravelReqController.java
@@ -11,6 +11,7 @@ import com.ruoyi.hrm.domain.bo.HrmTravelReqBo;
 import com.ruoyi.hrm.domain.vo.HrmTravelReqVo;
 import com.ruoyi.hrm.service.IHrmTravelReqService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,6 +32,9 @@ public class HrmTravelReqController extends BaseController {
     private final IHrmTravelReqService service;
     private final IHrmTravelReqService hrmTravelReqService;
 
+    @Value("${fad.amap.key}")
+    private String amapKey;
+
     @GetMapping("/list")
     public TableDataInfo<HrmTravelReqVo> list(HrmTravelReqBo bo, PageQuery pageQuery) {
         return service.queryPageList(bo, pageQuery);
@@ -62,7 +66,10 @@ public class HrmTravelReqController extends BaseController {
     public R<Void> earlyEnd(@PathVariable Long bizId) {
         return toAjax(hrmTravelReqService.earlyEnd(bizId));
     }
-
+    @GetMapping("/amapKey")
+    public R<String> getAmapKey() {
+        return R.ok(amapKey);
+    }
     @GetMapping("/all")
     public R<List<HrmTravelReqVo>> all(HrmTravelReqBo bo) {
         return R.ok(service.queryList(bo));
diff --git a/ruoyi-ui/src/api/hrm/travel.js b/ruoyi-ui/src/api/hrm/travel.js
index fc49024..4ed055e 100644
--- a/ruoyi-ui/src/api/hrm/travel.js
+++ b/ruoyi-ui/src/api/hrm/travel.js
@@ -52,3 +52,10 @@ export function earlyEndTravel(bizId) {
     method: 'put'
   })
 }
+
+export function getAmapKey() {
+  return request({
+    url: '/hrm/travel/amapKey',
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/components/AmapCitySelect/index.vue b/ruoyi-ui/src/components/AmapCitySelect/index.vue
index f25aee9..dad912e 100644
--- a/ruoyi-ui/src/components/AmapCitySelect/index.vue
+++ b/ruoyi-ui/src/components/AmapCitySelect/index.vue
@@ -88,6 +88,7 @@
 
 <script>
 import AMapLoader from '@amap/amap-jsapi-loader'
+import { getAmapKey } from '@/api/hrm/travel'
 
 export default {
   name: 'AmapCitySelect',
@@ -121,6 +122,7 @@ export default {
     }
   },
   methods: {
+    // 弹窗打开时调用
     async onDialogOpened() {
       await this.loadAMap()
       this.$nextTick(() => {
@@ -128,19 +130,25 @@ export default {
       })
     },
     
+    // 加载高德地图
     async loadAMap() {
       if (this.AMap) return this.AMap
       
-      // 【关键修改：必须在此处配置安全密钥】
-      window._AMapSecurityConfig = {
-        securityJsCode: 'a2969c40309b1a3930f78b2a232d0de0', // 你的安全密钥
-      }
-      
       try {
+        const res = await getAmapKey()
+        console.log("接口完整返回：", JSON.stringify(res))
+
+         const amapkey = res.msg
+        console.log('获取到的Key:', amapkey)
+        
+        if (!amapkey) {
+          throw new Error('获取高德地图Key失败')
+        }
+        
         this.AMap = await AMapLoader.load({
-          key: '27baa1cd7dee515accbcf8534d1a2e0e',  // 您的Key
+          key: amapkey,
           version: '2.0',
-          plugins: ['AMap.Geocoder', 'AMap.PlaceSearch'] // 插件在这里被正确加载了
+          plugins: ['AMap.Geocoder', 'AMap.PlaceSearch']
         })
         return this.AMap
       } catch (error) {