From b2bbdb8ad496086ca8d298dbb7c6ff94c889f1eb Mon Sep 17 00:00:00 2001 From: yschoi Date: Sat, 26 Jul 2025 20:09:41 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=80=EC=83=89=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/app/(map-layout)/map/page.tsx | 34 ++-- .../(map-layout)/map/searchModal/basicTab.tsx | 2 +- .../map/searchModal/operationTab.tsx | 2 +- .../map/searchModal/reportTab.tsx | 2 +- .../map/searchModal/searchModal.tsx | 21 +-- .../(map-layout)/map/searchModal/swageMhl.tsx | 9 + .../map/searchModal/swagePmstn.tsx | 11 ++ .../(map-layout)/map/searchModal/swagePpl.tsx | 11 ++ .../map/searchModal/swagePrcsFclt.tsx | 12 ++ .../map/searchModal/swagePrcsZone.tsx | 9 + apps/sn/app/page.tsx | 4 +- .../business_components/src/ui/map/Gis.js | 164 +++++++++--------- .../business_components/src/ui/tab/index.tsx | 2 +- 13 files changed, 170 insertions(+), 113 deletions(-) diff --git a/apps/sn/app/(map-layout)/map/page.tsx b/apps/sn/app/(map-layout)/map/page.tsx index 9a1821d19..2dbbcdd1a 100644 --- a/apps/sn/app/(map-layout)/map/page.tsx +++ b/apps/sn/app/(map-layout)/map/page.tsx @@ -41,7 +41,7 @@ const Map = () => { const fetchData = async () => { try { - const data = await getData('v1/map/lyrStngs/SN_NETWORK'); + const data = await getData("v1/map/lyrStngs/SN_NETWORK"); setTreeData(data); } catch (error) { console.error("데이터 불러오기 실패:", error); @@ -115,22 +115,22 @@ const Map = () => { }; return (
- +
); }; diff --git a/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx b/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx index 9bcb6e2c8..89d1db591 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx @@ -78,7 +78,7 @@ const BasicTab: React.FC = ({ setVar2, }) => { return ( -
+
{/* 구분 */}
diff --git a/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx b/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx index a3ec069e9..21225c27f 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx @@ -109,7 +109,7 @@ const OperationTab: React.FC = ({ setYearFilter, }) => { return ( -
+
= ({ return ( -
+
= ({ } else if (activeTab === 'operation') { const RequestDTO: Record = { page: `${curPage - 1}`, - size: '4', + size: '5', }; if (var1) RequestDTO.bizNm = var1; if (var2 != '0' && var2) RequestDTO.bizTyCd = var2; @@ -521,8 +521,8 @@ const SearchModal: React.FC = ({ try { const RequestDTO: Record = { page: `${detailCurPage - 1}`, - size: '4', - bizId: tableData[index % 4].bizId, + size: '5', + bizId: tableData[index % 5].bizId, }; const res = await getData(`v1/bizInfo/fclts?${new URLSearchParams(RequestDTO).toString()}`); @@ -557,7 +557,7 @@ const SearchModal: React.FC = ({ try { const RequestDTO: Record = { page: `${detailCurPage - 1}`, - size: '4', + size: '5', bizId: String(detailBizId), }; const res = await getData(`v1/bizInfo/fclts?${new URLSearchParams(RequestDTO).toString()}`); @@ -620,6 +620,7 @@ const SearchModal: React.FC = ({ }))} onValueChange={(value: string) => setActiveTab(value)} > + {/* 각각의 탭 영역 */} {/* 기본정보 탭 */} {activeTab === 'basic' && ( @@ -681,12 +682,12 @@ const SearchModal: React.FC = ({ /> )} {/* */} - + {/* 📋 결과 리스트 */} {/* 기본정보 탭, 하수도정비기본계획보고서 탭 */} {(activeTab === 'basic' || activeTab === 'report') && ( -
+
{/* 테이블2 영역 (가로/세로 스크롤 가능) */}
@@ -711,7 +712,7 @@ const SearchModal: React.FC = ({ {/* 운영정보 탭 */} {activeTab === 'operation' && ( <> -
+
= ({ } tableData={tableData} headlist={dynamicHeadlist} - pageSize={4} + pageSize={5} total={tableCount} cellClick={handleOperationCellClick} onPageChange={setCurPage} @@ -733,7 +734,7 @@ const SearchModal: React.FC = ({
-
+
= ({ } tableData={detailTableData} headlist={dynamicHeadlist2} - pageSize={4} + pageSize={5} total={detailTableCount} cellClick={undefined} onPageChange={setDetailCurPage} diff --git a/apps/sn/app/(map-layout)/map/searchModal/swageMhl.tsx b/apps/sn/app/(map-layout)/map/searchModal/swageMhl.tsx index 9c2ea9594..5d678bf1a 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/swageMhl.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/swageMhl.tsx @@ -30,6 +30,13 @@ const SwageMhl: React.FC = ({ setYearFilter, handleSearch, }) => { + + const handleEnterKey = (e: React.KeyboardEvent) => { + if (e.key === 'Enter') { + handleSearch(); + } + }; + return (
@@ -70,6 +77,7 @@ const SwageMhl: React.FC = ({ const val = e.target.value.replace(/[^0-9]/g, ""); setStart1(val); }} + onKeyDown={handleEnterKey} /> ~ = ({ const val = e.target.value.replace(/[^0-9]/g, ""); setEnd1(val); }} + onKeyDown={handleEnterKey} /> {/* 조회 버튼 */}
diff --git a/apps/sn/app/(map-layout)/map/searchModal/swagePmstn.tsx b/apps/sn/app/(map-layout)/map/searchModal/swagePmstn.tsx index ff023b996..9543cf218 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/swagePmstn.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/swagePmstn.tsx @@ -31,6 +31,13 @@ const SwagePmstn: React.FC = ({ setYearFilter, handleSearch, }) => { + + const handleEnterKey = (e: React.KeyboardEvent) => { + if (e.key === 'Enter') { + handleSearch(); + } + }; + return (
@@ -53,6 +60,7 @@ const SwagePmstn: React.FC = ({ const val = e.target.value.replace(/[^0-9]/g, ""); setStart1(val); }} + onKeyDown={handleEnterKey} /> ~ = ({ const val = e.target.value.replace(/[^0-9]/g, ""); setEnd1(val); }} + onKeyDown={handleEnterKey} /> {/* 양수능력 - 우수맨홀 */}