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 list(HrmTravelReqBo bo, PageQuery pageQuery) { return service.queryPageList(bo, pageQuery); @@ -62,7 +66,10 @@ public class HrmTravelReqController extends BaseController { public R earlyEnd(@PathVariable Long bizId) { return toAjax(hrmTravelReqService.earlyEnd(bizId)); } - + @GetMapping("/amapKey") + public R getAmapKey() { + return R.ok(amapKey); + } @GetMapping("/all") public R> 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 @@