diff --git a/src/components/laanc/LaancGrid.js b/src/components/laanc/LaancGrid.js
index 0e66c386..c38d679f 100644
--- a/src/components/laanc/LaancGrid.js
+++ b/src/components/laanc/LaancGrid.js
@@ -96,7 +96,7 @@ function LaancGrid() {
minWidth: '80px',
sortable: true,
cell: row => {
- return row.elev;
+ return row.elev + 'm';
}
},
{
@@ -152,7 +152,7 @@ function LaancGrid() {
LAANC 승인 신청 목록
- 검색결과 총 {laancSearchData?.numberOfElements}건
+ 검색결과 총 {laancSearchData?.length}건
@@ -168,10 +168,10 @@ function LaancGrid() {
) : null}
- {laancSearchData?.numberOfElements > 0 ? (
+ {laancSearchData?.length > 0 ? (
{
diff --git a/src/modules/laanc/apis/laancApi.ts b/src/modules/laanc/apis/laancApi.ts
index 1e55a655..b1ce6eb2 100644
--- a/src/modules/laanc/apis/laancApi.ts
+++ b/src/modules/laanc/apis/laancApi.ts
@@ -27,7 +27,7 @@ export const laancApi = {
},
// 승인 목록 검색
getAprvList: async (data: LaancAprvRq) => {
- const res = await axios.get(`api/bas/laanc/aprv/list`, {
+ const res = await axios.get(`api/bas/laanc/aprv/list2`, {
params: data
});
return res.data;
diff --git a/src/modules/laanc/models/laancModels.ts b/src/modules/laanc/models/laancModels.ts
index 6db6cde4..99a2c22d 100644
--- a/src/modules/laanc/models/laancModels.ts
+++ b/src/modules/laanc/models/laancModels.ts
@@ -623,41 +623,38 @@ export interface LaancAprvRq {
// laanc 승인 요청 rs
export interface LaancAprvData {
- content: [
- {
- planSno: number;
- groupId: string;
- cstmrSno: number;
- memberName: string;
- email: string;
- hpno: string;
- clncd: string;
- schFltStDt: string;
- schFltEndDt: string;
- fltPurpose: string;
- aprvlYn: string;
- createUserId: string;
- createDt: string;
- updateUserId: string;
- updateDt: string;
- serviceType: string;
- }
- ];
- areaList: [
- {
- planAreaSno: number;
- planSno: number;
- areaType: string;
- fltAreaAddr: string;
- bufferZone: number;
- fltElev: string;
- createUserId: string;
- createDt: string;
- updateUserId: string;
- updateDt: string;
- docState: string;
- }
- ];
- totalElements: number;
- totalPages: number;
+ count: number;
+ data: {
+ planSno: number;
+ groupId: string;
+ cstmrSno: number;
+ memberName: string;
+ email: string;
+ hpno: string;
+ clncd: string;
+ schFltStDt: string;
+ schFltEndDt: string;
+ fltPurpose: string;
+ aprvlYn: string;
+ createUserId: string;
+ createDt: string;
+ updateUserId: string;
+ updateDt: string;
+ serviceType: string;
+ areaList: [
+ {
+ planAreaSno: number;
+ planSno: number;
+ areaType: string;
+ fltAreaAddr: string;
+ bufferZone: number;
+ fltElev: string;
+ createUserId: string;
+ createDt: string;
+ updateUserId: string;
+ updateDt: string;
+ docState: string;
+ }
+ ];
+ };
}
diff --git a/src/views/laanc/LaancStep1.js b/src/views/laanc/LaancStep1.js
index dd2eeb95..6ce74b4d 100644
--- a/src/views/laanc/LaancStep1.js
+++ b/src/views/laanc/LaancStep1.js
@@ -168,22 +168,26 @@ export default function LaancStep1({
const handleBlur = (value, type) => {
switch (type) {
case 'fltElev':
+ // if (
+ // &&
+ // data.areaList[0].coordList[0].lat != 0
+ // ) {
+ // setIsErrorModal({
+ // isOpen: true,
+ // title: '고도 알림',
+ // desc: (
+ // <>
+ // 관제권 및 비행금지 공역을 제외한 지역에서는 주간에 150m미만의
+ //
+ // 고도에서는 비행승인없이 비행가능합니다.
+ // >
+ // )
+ // });
+ // }
if (
- parseInt(value.replace('/^0+/', 'm', ''), 10) <= 150 &&
+ parseInt(value.replace('/^0+/', 'm', ''), 10) > 150 &&
data.areaList[0].coordList[0].lat != 0
) {
- setIsErrorModal({
- isOpen: true,
- title: '고도 알림',
- desc: (
- <>
- 관제권 및 비행금지 공역을 제외한 지역에서는 주간에 150m미만의
-
- 고도에서는 비행승인없이 비행가능합니다.
- >
- )
- });
- } else if (data.areaList[0].coordList[0].lat != 0) {
handleChange({
type: 'area',
name: 'fltElev',