From 5ca8894633bf9212b1c4b89147ef22bac32070b6 Mon Sep 17 00:00:00 2001 From: JANGHYUNn Date: Wed, 4 Sep 2024 08:11:44 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=8A=B9=EC=9D=B8=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B2=80=EC=83=89=20=EC=98=81?= =?UTF-8?q?=EC=97=AD=20input=20label=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/NewFlightApprovalsReport.js | 13 +++++-------- src/configs/constants.ts | 18 +++++++++--------- .../flight/ControlApprovalsContainer.js | 8 ++++---- .../flight/OperationApprovalsContainer.js | 8 ++++---- .../popup/ControlApprovalsPopupContainer.js | 8 ++++---- .../popup/OperationApprovalsPopupContainer.js | 8 ++++---- 6 files changed, 30 insertions(+), 33 deletions(-) diff --git a/src/components/flight/NewFlightApprovalsReport.js b/src/components/flight/NewFlightApprovalsReport.js index 9f47fafe..c53f26a9 100644 --- a/src/components/flight/NewFlightApprovalsReport.js +++ b/src/components/flight/NewFlightApprovalsReport.js @@ -26,8 +26,6 @@ export default function NewFlightApprovalsReport(props) { endDate: dayjs().format('YYYY-MM-DD') }); - const flatPickerRef = useRef(null); - useEffect(() => { const popupSyncSearchData = JSON.parse(localStorage.getItem('popupState')); @@ -39,10 +37,10 @@ export default function NewFlightApprovalsReport(props) { }); props.setFilterId(popupSyncSearchData.filter); - flatPickerRef.current.flatpickr.setDate( - [popupSyncSearchData.startDate, popupSyncSearchData.endDate], - true - ); + setSearchDate({ + startDate: popupSyncSearchData.startDate, + endDate: popupSyncSearchData.endDate + }); localStorage.removeItem('popupState'); } }, []); @@ -89,7 +87,6 @@ export default function NewFlightApprovalsReport(props) {
diff --git a/src/configs/constants.ts b/src/configs/constants.ts index 0a8610a8..159422f5 100644 --- a/src/configs/constants.ts +++ b/src/configs/constants.ts @@ -138,7 +138,7 @@ export const QS_OPTION: IQsOptionType = { // 시도 검색 카테고리 export const CityCategories = { - 전체: '전체', + '시/도': '시/도', 서울특별시: '서울특별시', 인천광역시: '인천광역시', 경기도: '경기도' @@ -149,9 +149,9 @@ export type CityCategory = keyof typeof CityCategories; // 관제과 시군구 검색 카테고리 export const DistrictCategories = { control: { - 전체: ['전체'], + '시/도': ['군/구'], 서울특별시: [ - '전체', + '군/구', '강서구', '구로구', '마포구', @@ -159,9 +159,9 @@ export const DistrictCategories = { '영등포구', '은평구' ], - 인천광역시: ['전체', '계양구', '부평구', '서구'], + 인천광역시: ['군/구', '계양구', '부평구', '서구'], 경기도: [ - '전체', + '군/구', '고양시 덕양구', '고양시 일산동구', '김포시', @@ -171,9 +171,9 @@ export const DistrictCategories = { ] }, operation: { - 전체: ['전체'], + '시/도': ['군/구'], 서울특별시: [ - '전체', + '군/구', '강남구', '강동구', '강북구', @@ -200,9 +200,9 @@ export const DistrictCategories = { '중구', '중랑구' ], - 인천광역시: ['전체', '계양구', '부평구', '서구'], + 인천광역시: ['군/구', '계양구', '부평구', '서구'], 경기도: [ - '전체', + '군/구', '가평군', '고양시 덕양구', '고양시 일산동구', diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js index 5202a049..370a565b 100644 --- a/src/containers/flight/ControlApprovalsContainer.js +++ b/src/containers/flight/ControlApprovalsContainer.js @@ -68,8 +68,8 @@ export default function ControlApprovalsContainer({ mode }) { }); // 지역 const [filterArea, setFilterArea] = useState({ - ctprvn: '전체', - sig: '전체', + ctprvn: '시/도', + sig: '군/구', address: '' }); @@ -237,8 +237,8 @@ export default function ControlApprovalsContainer({ mode }) { getLaancAprvList({ searchStDt: searchDate.startDate, searchEndDt: searchDate.endDate, - ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn, - sig: filterArea.sig === '전체' ? '' : filterArea.sig, + ctprvn: filterArea.ctprvn === '시/도' ? '' : filterArea.ctprvn, + sig: filterArea.sig === '군/구' ? '' : filterArea.sig, address: filterArea.address, limitZoneCd: checkState.limitZoneNm === '전체' ? '' : checkState.limitZoneNm, diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js index 30992bef..310b66d7 100644 --- a/src/containers/flight/OperationApprovalsContainer.js +++ b/src/containers/flight/OperationApprovalsContainer.js @@ -74,8 +74,8 @@ export default function OperationApprovalsContainer({ mode }) { // 지역 const [filterArea, setFilterArea] = useState({ - ctprvn: '전체', - sig: '전체', + ctprvn: '시/도', + sig: '군/구', address: '' }); @@ -279,8 +279,8 @@ export default function OperationApprovalsContainer({ mode }) { getLaancAprvList({ searchStDt: searchDate.startDate, searchEndDt: searchDate.endDate, - ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn, - sig: filterArea.sig === '전체' ? '' : filterArea.sig, + ctprvn: filterArea.ctprvn === '시/도' ? '' : filterArea.ctprvn, + sig: filterArea.sig === '군/구' ? '' : filterArea.sig, address: filterArea.address, limitZoneCd: checkState.limitZoneNm === '전체' ? '' : checkState.limitZoneNm, diff --git a/src/containers/flight/popup/ControlApprovalsPopupContainer.js b/src/containers/flight/popup/ControlApprovalsPopupContainer.js index 4c0198b7..8d511d13 100644 --- a/src/containers/flight/popup/ControlApprovalsPopupContainer.js +++ b/src/containers/flight/popup/ControlApprovalsPopupContainer.js @@ -15,8 +15,8 @@ function ControlApprovalsPopupContainer() { // 지역 const [filterArea, setFilterArea] = useState({ - ctprvn: '전체', - sig: '전체', + ctprvn: '시/도', + sig: '군/구', address: '' }); @@ -86,8 +86,8 @@ function ControlApprovalsPopupContainer() { getLaancAprvList({ searchStDt: searchDate.startDate, searchEndDt: searchDate.endDate, - ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn, - sig: filterArea.sig === '전체' ? '' : filterArea.sig, + ctprvn: filterArea.ctprvn === '시/도' ? '' : filterArea.ctprvn, + sig: filterArea.sig === '군/구' ? '' : filterArea.sig, address: filterArea.address, limitZoneCd: checkState.limitZoneNm === '전체' ? '' : checkState.limitZoneNm, diff --git a/src/containers/flight/popup/OperationApprovalsPopupContainer.js b/src/containers/flight/popup/OperationApprovalsPopupContainer.js index e5e37d7a..e15e170c 100644 --- a/src/containers/flight/popup/OperationApprovalsPopupContainer.js +++ b/src/containers/flight/popup/OperationApprovalsPopupContainer.js @@ -17,8 +17,8 @@ function OperationApprovalsPopupContainer() { // 지역 const [filterArea, setFilterArea] = useState({ - ctprvn: '전체', - sig: '전체', + ctprvn: '시/도', + sig: '군/구', address: '' }); @@ -110,8 +110,8 @@ function OperationApprovalsPopupContainer() { getLaancAprvList({ searchStDt: searchDate.startDate, searchEndDt: searchDate.endDate, - ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn, - sig: filterArea.sig === '전체' ? '' : filterArea.sig, + ctprvn: filterArea.ctprvn === '시/도' ? '' : filterArea.ctprvn, + sig: filterArea.sig === '군/구' ? '' : filterArea.sig, address: filterArea.address, limitZoneCd: checkState.limitZoneNm === '전체' ? '' : checkState.limitZoneNm,