From 2aa202ace3dcf4a573a5b498f91b047170edb226 Mon Sep 17 00:00:00 2001 From: swcho Date: Wed, 9 Jul 2025 11:30:12 +0900 Subject: [PATCH] Revert "Merge branch 'iipbs/sn/ii' into iipbs/sn/main" This reverts commit 63012618a26413f7f53ec7e8062a6dd8d43d956e, reversing changes made to 6573981505c70541c238344b7fc17e065109dddd. --- apps/sn/app/(map-layout)/map/SearchModal.tsx | 35 +-- .../map/components/InputSection.tsx | 8 +- .../map/components/common/table.ts | 289 ++++++------------ .../components/popupComponent/MsSwagePpl.tsx | 2 +- .../map/components/popupComponent/Ssc.tsx | 17 +- .../components/popupComponent/sewagePump.tsx | 13 +- .../map/components/popupComponent/smh.tsx | 3 +- .../map/featureClickEventPopup.tsx | 47 +-- .../(with-base-layout)/oper/floodPre/page.tsx | 47 +-- .../(with-base-layout)/oper/oldPp/page.tsx | 44 +-- apps/sn/app/components/ui/fileUploadForm.tsx | 5 - apps/sn/app/components/ui/verticalTable.tsx | 2 +- .../src/ui/chart/BarChart.tsx | 2 +- .../src/ui/sdmInsertForm/form.tsx | 104 ++----- .../src/ui/sdmInsertForm/index.tsx | 15 +- .../src/ui/sdmInsertForm/sdmNameBox.tsx | 152 ++++----- .../src/ui/search_form_left/index.tsx | 2 +- .../src/ui/table/index.tsx | 10 +- .../src/ui/table/uiPageNations.tsx | 10 +- .../components/src/ui/date-picker/index.tsx | 7 +- 20 files changed, 240 insertions(+), 574 deletions(-) diff --git a/apps/sn/app/(map-layout)/map/SearchModal.tsx b/apps/sn/app/(map-layout)/map/SearchModal.tsx index 73cc5fc8e..e17b80724 100644 --- a/apps/sn/app/(map-layout)/map/SearchModal.tsx +++ b/apps/sn/app/(map-layout)/map/SearchModal.tsx @@ -2,13 +2,13 @@ import FeatureClickEventPopup from './featureClickEventPopup'; import React, { useEffect, useState } from 'react'; import axios from 'axios'; import { UiModal, UiTable } from '@common/business_components/ui'; -import { Button, DatePicker, Input, Label } from '@common/components'; +import { Button, Input, Label } from '@common/components'; import { UiTable2 } from '@common/business_components/ui/table/index-2'; import { UITab2 } from '@common/business_components/ui/tab/index-2'; import { SelectBox2 } from '@common/business_components/ui/select/index-2'; import { YearRangeSelectBox } from '@/components/ui/YearRangeSelectBox'; import { SidoSigunguSelectBox } from '@/components/ui/SidoSigunguSelectBox'; -import { MsSwagePplCol2, SwtrmtFcltCol2, SwtrmtPrcsZoneCol2, MsSwageMhlCol2, ExclnSewagePumpCol2, stofcbrCol2 } from './components/common/table'; +import { MsSwagePplCol2, SwtrmtFcltCol2, SwtrmtPrcsZoneCol2, MsSwageMhlCol2, SewagePump2, stofcbrCol2 } from './components/common/table'; import LoadingOverlay from '@/components/ui/LoadingBar'; const API_URL = `${process.env.NEXT_PUBLIC_SEWERAGE_API_URL}`; @@ -122,8 +122,6 @@ const SearchModal: React.FC = ({ const [가동개시_종료_월, set가동개시_종료_월] = useState(''); const [가동개시_시작_일, set가동개시_시작_일] = useState(''); const [가동개시_종료_일, set가동개시_종료_일] = useState(''); - const [fromDate, setFromDate] = useState(() => { const date = new Date(); date.setDate(date.getDate() - 7); return date }) - const [toDate, setToDate] = useState(new Date()) // 로딩바 const [isLoading, setIsLoading] = useState(false); @@ -144,7 +142,7 @@ const SearchModal: React.FC = ({ else if (basicType === 'tb_il_swage_prcs_fclt') dynamicHeadlist = SwtrmtFcltCol2; // 하수처리시설 else if (basicType === 'tb_ms_swage_prcs_zone') dynamicHeadlist = SwtrmtPrcsZoneCol2; // 하수처리구역 else if (basicType === 'tb_ms_swage_mhl') dynamicHeadlist = MsSwageMhlCol2; // 하수맨홀 - else if (basicType === 'tb_ms_swage_pmstn') dynamicHeadlist = ExclnSewagePumpCol2; // 하수펌프장 + else if (basicType === 'tb_ms_swage_pmstn') dynamicHeadlist = SewagePump2; // 하수펌프장 else if (basicType === 'tb_ms_stofcbr') dynamicHeadlist = stofcbrCol2; // 우수토실 // 조회 버튼 클릭 시 1페이지로 이동하도록 수정 @@ -950,8 +948,8 @@ const SearchModal: React.FC = ({ value={workType} /> - {/* 수행기간 */} - {/* @@ -961,29 +959,8 @@ const SearchModal: React.FC = ({ 종료: range.end, }) } - startLabel="수행기간" + startLabel="설치년도" endLabel="" - /> */} - { if (date) setFromDate(date) }} - modifiers={{ - disabled: { after: new Date() } - }} - zIndex={102} - /> - ~ - { if (date) setToDate(date) }} - modifiers={{ - disabled: { after: new Date() } - }} - zIndex={102} />
{/* 경과년도 */} diff --git a/apps/sn/app/(map-layout)/map/components/InputSection.tsx b/apps/sn/app/(map-layout)/map/components/InputSection.tsx index 209361293..fe8897703 100644 --- a/apps/sn/app/(map-layout)/map/components/InputSection.tsx +++ b/apps/sn/app/(map-layout)/map/components/InputSection.tsx @@ -20,14 +20,14 @@ const InputSection: React.FC = ({ title, data, sectionKey, on - 년도 - 구분 + 년도 + 구분 {data.map((row, index) => ( - + = ({ title, data, sectionKey, on className="w-full text-xl border-radius-0 px-3 py-2 text-base text-center leading-normal" /> - + {row.type} diff --git a/apps/sn/app/(map-layout)/map/components/common/table.ts b/apps/sn/app/(map-layout)/map/components/common/table.ts index f114cf97b..1747106cc 100644 --- a/apps/sn/app/(map-layout)/map/components/common/table.ts +++ b/apps/sn/app/(map-layout)/map/components/common/table.ts @@ -1,65 +1,65 @@ // 하수관로 export const MsSwagePplCol = [ + { id: 'avg_grdn', title: '평균구배' }, + { id: 'clar_fvlc', title: '맑음유속' }, + { id: 'drtw_mltv_area', title: '오수배수면적' }, + { id: 'excln_mltv_area', title: '우수배수면적' }, { id: 'fclt_mng_no', title: '시설관리번호' }, - { id: 'inst_mng_no', title: '기관관리번호' }, - { id: 'instl_ymd', title: '설치일자' }, - { id: 'mapsht_no', title: '도엽번호' }, - { id: 'pdmt', title: '관경(mm)' }, - { id: 'prlg', title: '연장(m)' }, - { id: 'usg_cd', title: '용도코드' }, - { id: 'mqlt_cd', title: '재질코드' }, - { id: 'avg_grdn', title: '평균구배(m/m)' }, - { id: 'drtw_mltv_area', title: '오수배수면적(m²)' }, - { id: 'excln_mltv_area', title: '우수배수면적(m²)' }, - { id: 'tmpt_dpth', title: '시점깊이(m)' }, - { id: 'tmpt_mhl_mng_no', title: '시점맨홀관리번호' }, - { id: 'scend_dpth', title: '종점깊이(m)' }, - { id: 'scend_mhl_mng_no', title: '종점맨홀관리번호' }, - { id: 'trfln_cnt', title: '차선수' }, - { id: 'vrtc_len', title: '세로길이(m)' }, - { id: 'wdth_len', title: '가로길이(m)' }, - // { id: 'rnyssn_fvlc', title: '우기 시 유속(m/s)' }, - // { id: 'clar_fvlc', title: '건기 시 유속(m/s)' }, - // { id: 'mng_inst_cd', title: '관리기관코드' }, - // { id: 'pbadms_emd_cd', title: '행정읍면동코드' }, // { id: 'fclty_shp_cd', title: '시설물형태코드' }, // { id: 'fid', title: 'FID' }, // { id: 'ftre_smbol_cd', title: '지형지물부호코드' }, + { id: 'inst_mng_no', title: '기관관리번호' }, + { id: 'instl_ymd', title: '설치일자' }, + { id: 'mapsht_no', title: '도엽번호' }, + // { id: 'mng_inst_cd', title: '관리기관코드' }, + // { id: 'mqlt_cd', title: '재질코드' }, + // { id: 'pbadms_emd_cd', title: '행정읍면동코드' }, + { id: 'pdmt', title: '관경' }, + { id: 'prlg', title: '연장' }, + { id: 'rnyssn_fvlc', title: '우기유속' }, + { id: 'scend_dpth', title: '종점깊이' }, + { id: 'scend_mhl_mng_no', title: '종점맨홀관리번호' }, + { id: 'tmpt_dpth', title: '시점깊이' }, + { id: 'tmpt_mhl_mng_no', title: '시점맨홀관리번호' }, + { id: 'trfln_cnt', title: '차선수' }, + // { id: 'usg_cd', title: '용도코드' }, + { id: 'vrtc_len', title: '세로길이' }, + { id: 'wdth_len', title: '가로길이' }, // { id: 'lyrTypeNm', title: '레이어타입명' }, ] export const MsSwagePplCol2 = [ + { id: 'avgGrdn', title: '평균구배' }, + { id: 'clarFvlc', title: '맑음유속' }, + { id: 'drtwMltvArea', title: '오수배수면적' }, + { id: 'exclnMltvArea', title: '우수배수면적' }, { id: 'fcltMngNo', title: '시설관리번호' }, - { id: 'instMngNo', title: '기관관리번호' }, - { id: 'instlYmd', title: '설치일자' }, - { id: 'mapshtNo', title: '도엽번호' }, - { id: 'pdmt', title: '관경(mm)' }, - { id: 'prlg', title: '연장(m)' }, - { id: 'avgGrdn', title: '평균구배(m/m)' }, - { id: 'rnysnFvlc', title: '우기 시 유속(m/s)' }, - { id: 'clarFvlc', title: '건기 시 유속(m/s)' }, - { id: 'drtwMltvArea', title: '오수배수면적(m²)' }, - { id: 'exclnMltvArea', title: '우수배수면적(m²)' }, - { id: 'tmptDpth', title: '시점깊이(m)' }, - { id: 'tmptMhlMngNo', title: '시점맨홀관리번호' }, - { id: 'scendDpth', title: '종점깊이(m)' }, - { id: 'scendMhlMngNo', title: '종점맨홀관리번호' }, - { id: 'trflnCnt', title: '차선수' }, - { id: 'vrtcLen', title: '세로길이(m)' }, - { id: 'wdthLen', title: '가로길이(m)' }, // { id: 'fcltyShpCd', title: '시설물형태코드' }, // { id: 'fid', title: 'FID' }, // { id: 'ftreSmbolCd', title: '지형지물부호코드' }, + { id: 'instMngNo', title: '기관관리번호' }, + { id: 'instlYmd', title: '설치일자' }, + { id: 'mapshtNo', title: '도엽번호' }, // { id: 'mngInstCd', title: '관리기관코드' }, // { id: 'mqltCd', title: '재질코드' }, // { id: 'pbadmsEmdCd', title: '행정읍면동코드' }, + { id: 'pdmt', title: '관경' }, + { id: 'prlg', title: '연장' }, + // { id: 'rnysnFvlc', title: '우기유속' }, + { id: 'scendDpth', title: '종점깊이' }, + { id: 'scendMhlMngNo', title: '종점맨홀관리번호' }, + { id: 'tmptDpth', title: '시점깊이' }, + { id: 'tmptMhlMngNo', title: '시점맨홀관리번호' }, + { id: 'trflnCnt', title: '차선수' }, // { id: 'usgCd', title: '용도코드' }, + { id: 'vrtcLen', title: '세로길이' }, + { id: 'wdthLen', title: '가로길이' }, // { id: 'lyrTypeNm', title: '레이어타입명' }, ] // 하수처리시설 export const SwtrmtFcltCol = [ { id: 'swtrmt_fclt_nm', title: '하수처리시설명' }, - { id: 'fclt_cpct', title: '시설용량(㎥/d)' }, + { id: 'fclt_cpct', title: '시설용량' }, { id: 'rgn_expln', title: '지역설명' }, { id: 'cmcn_ymd', title: '준공일자' }, { id: 'oprtng_strt_ymd', title: '가동개시일자' }, @@ -78,26 +78,26 @@ export const SwtrmtFcltCol = [ { id: 'rdnm_addr', title: '도로명주소' }, { id: 'dtl_rdnm_addr', title: '상세도로명주소' }, { id: 'dschg_wtst_nm', title: '방류수계명' }, - { id: 'plln_area', title: '부지면적(m²)' }, + { id: 'plln_area', title: '부지면적' }, { id: 'mng_rprtv_bzenty_nm', title: '관리대행업제명' }, - { id: 'swtrmt_ppltn_cnt', title: '하수처리인구수(인)' }, - { id: 'prcs_zone_area_sum', title: '처리구역면적합계(m²)' }, + { id: 'swtrmt_ppltn_cnt', title: '하수처리인구수' }, + { id: 'prcs_zone_area_sum', title: '처리구역면적합계' }, { id: 'xcrd', title: 'X좌표' }, { id: 'ycrd', title: 'Y좌표' }, // { id: 'oprtngSttsCd', title: '가동상태코드' }, { id: 'rprs_msrc_cn', title: '대표공법내용' }, - { id: 'stty_crtr_bod', title: '법정기준생물화학적산소요구량(mg/L)' }, - { id: 'stty_crtr_toc', title: '법정기준TOC((mg/L))' }, - { id: 'stty_crtr_ss', title: '법정기준SS(mg/L)' }, - { id: 'stty_crtr_tn', title: '법정기준총질소(mg/L)' }, - { id: 'stty_crtr_tph', title: '법정기준총인(mg/L)' }, - { id: 'stty_crtr_clbcl_cnt', title: '법정기준대장균수(군수/100mL)' }, + { id: 'stty_crtr_bod', title: '법정기준생물화학적산소요구량' }, + { id: 'stty_crtr_toc', title: '법정기준TOC' }, + { id: 'stty_crtr_ss', title: '법정기준SS' }, + { id: 'stty_crtr_tn', title: '법정기준총질소' }, + { id: 'stty_crtr_tph', title: '법정기준총인' }, + { id: 'stty_crtr_clbcl_cnt', title: '법정기준대장균수' }, { id: 'bsn_nm', title: '유역명' }, // { id: 'obsrvnSptCd', title: '관측지점코드' }, ]; export const SwtrmtFcltCol2 = [ { id: 'swtrmtFcltNm', title: '하수처리시설명' }, - { id: 'fcltCpct', title: '시설용량(㎥/d)' }, + { id: 'fcltCpct', title: '시설용량' }, { id: 'rgnExpln', title: '지역설명' }, { id: 'cmcnYmd', title: '준공일자' }, { id: 'oprtngStrtYmd', title: '가동개시일자' }, @@ -116,20 +116,20 @@ export const SwtrmtFcltCol2 = [ { id: 'rdnmAddr', title: '도로명주소' }, { id: 'dtlRdnmAddr', title: '상세도로명주소' }, { id: 'dschgWtstNm', title: '방류수계명' }, - { id: 'pllnArea', title: '부지면적(m²)' }, + { id: 'pllnArea', title: '부지면적' }, { id: 'mngRprtvBzentyNm', title: '관리대행업제명' }, - { id: 'swtrmtPpltnCnt', title: '하수처리인구수(인)' }, - { id: 'prcsZoneAreaSum', title: '처리구역면적합계(m²)' }, + { id: 'swtrmtPpltnCnt', title: '하수처리인구수' }, + { id: 'prcsZoneAreaSum', title: '처리구역면적합계' }, { id: 'xcrd', title: 'X좌표' }, { id: 'ycrd', title: 'Y좌표' }, // { id: 'oprtngSttsCd', title: '가동상태코드' }, { id: 'rprsMsrcCn', title: '대표공법내용' }, - { id: 'sttyCrtrBod', title: '법정기준생물화학적산소요구량(mg/L)' }, - { id: 'sttyCrtrToc', title: '법정기준TOC(mg/L)' }, - { id: 'sttyCrtrSs', title: '법정기준SS(mg/L)' }, - { id: 'sttyCrtrTn', title: '법정기준총질소(mg/L)' }, - { id: 'sttyCrtrTph', title: '법정기준총인(mg/L)' }, - { id: 'sttyCrtrClbclCnt', title: '법정기준대장균수(군수/100mL)' }, + { id: 'sttyCrtrBod', title: '법정기준생물화학적산소요구량' }, + { id: 'sttyCrtrToc', title: '법정기준TOC' }, + { id: 'sttyCrtrSs', title: '법정기준SS' }, + { id: 'sttyCrtrTn', title: '법정기준총질소' }, + { id: 'sttyCrtrTph', title: '법정기준총인' }, + { id: 'sttyCrtrClbclCnt', title: '법정기준대장균수' }, { id: 'bsnNm', title: '유역명' }, // { id: 'obsrvnSptCd', title: '관측지점코드' }, ]; @@ -170,14 +170,14 @@ export const MsSwageMhlCol = [ // { id: 'usg_cd', title: '용도코드' }, // { id: 'fclty_shp_cd', title: '시설물형태코드' }, // { id: 'mhl_knd_cd', title: '맨홀종류코드' }, - { id: 'swage_mh_diam', title: '하수맨홀구경(mm)' }, - { id: 'mqlt_cd', title: '재질코드' }, - { id: 'wdth_len', title: '가로길이(m)' }, - { id: 'vrtc_len', title: '세로길이(m)' }, + { id: 'swage_mh_diam', title: '하수맨홀구경' }, + { id: 'wdth_len', title: '가로길이' }, + { id: 'vrtc_len', title: '세로길이' }, + // { id: 'mqltCd', title: '재질코드' }, // { id: 'ang_dir', title: '표고' }, - { id: 'altd_vl', title: '표고(EL.m)' }, - { id: 'dpthlVl', title: '심도(m)' }, - // { id: 'inst_mng_no', title: '기관관리번호' } + { id: 'altd_vl', title: '표고' }, + { id: 'dpthlVl', title: '심도' }, + // { id: 'instMngNo', title: '기관관리번호' } ]; export const MsSwageMhlCol2 = [ // { id: 'fid', title: 'FID' }, @@ -192,81 +192,18 @@ export const MsSwageMhlCol2 = [ // { id: 'usgCd', title: '용도코드' }, // { id: 'fcltyShpCd', title: '시설물형태코드' }, // { id: 'mhlKndCd', title: '맨홀종류코드' }, - { id: 'swageMhDiam', title: '하수맨홀구경(mm)' }, - { id: 'mqltCd', title: '재질코드' }, - { id: 'wdthLen', title: '가로길이(m)' }, - { id: 'vrtcLen', title: '세로길이(m)' }, + { id: 'swageMhDiam', title: '하수맨홀구경' }, + { id: 'wdthLen', title: '가로길이' }, + { id: 'vrtcLen', title: '세로길이' }, + // { id: 'mqltCd', title: '재질코드' }, // { id: 'angDir', title: '표고' }, - { id: 'altdVl', title: '표고(EL.m)' }, - { id: 'dpthlVl', title: '심도(m)' }, + { id: 'altdVl', title: '표고' }, + { id: 'dpthlVl', title: '심도' }, // { id: 'instMngNo', title: '기관관리번호' } ]; -// 하수맨홀 뚜껑재질 코드표 -export const MS_SWAGE_MHL_CODES = [ - { val: "SBC000", text: "미분류" }, - { val: "SBC001", text: "주철" }, - { val: "SBC002", text: "철판" }, - { val: "SBC003", text: "콘크리트" }, - { val: "SBC004", text: "그레이팅" }, - { val: "SBC091", text: "칼라" }, - { val: "SBC092", text: "S.G" }, - { val: "SBC999", text: "기타" }, - { val: "SBC900", text: "각주철" }, - { val: "SBC901", text: "강재" }, - { val: "SBC902", text: "나무" }, - { val: "SBC903", text: "나무,널판지,합판" }, - { val: "SBC904", text: "대리석" }, - { val: "SBC905", text: "뚜껑없음" }, - { val: "SBC906", text: "보도용콘크리트" }, - { val: "SBC907", text: "스틸(ST)" }, - { val: "SBC908", text: "신형 CON" }, - { val: "SBC909", text: "알루미늄" }, - { val: "SBC910", text: "염화비닐(PE)" }, - { val: "SBC911", text: "인조석" }, - { val: "SBC912", text: "인조석(주철)" }, - { val: "SBC913", text: "인조CONC" }, - { val: "SBC914", text: "철, 철근" }, - { val: "SBC915", text: "칼라콘크리트" }, - { val: "SBC916", text: "플라스틱" }, - { val: "SBC917", text: "PVC" }, - { val: "SBC918", text: "SP" }, - { val: "SBC919", text: "SS" }, - { val: "SBC920", text: "닥타일주철" }, - { val: "SBC921", text: "철근G" }, - { val: "SBC922", text: "폴리에틸렌(PE)" }, - { val: "SBC923", text: "회주철" } -]; -// 하수맨홀 용도 코드표 -export const MS_SWAGE_MHL_USE_CODES = [ - { val: "SMU000", text: "미분류" }, - { val: "SMU001", text: "우수" }, - { val: "SMU002", text: "오수" }, - { val: "SMU003", text: "집수" }, - { val: "SMU004", text: "합류" }, - { val: "SMU005", text: "차집" }, - { val: "SMU999", text: "기타" }, - { val: "SMU900", text: "1호" }, - { val: "SMU901", text: "2호" }, - { val: "SMU902", text: "3호" }, - { val: "SMU903", text: "4호" }, - { val: "SMU904", text: "5호" }, - { val: "SMU905", text: "6호" }, - { val: "SMU906", text: "7호" }, - { val: "SMU907", text: "8호" }, - { val: "SMU908", text: "구거용맨홀" }, - { val: "SMU909", text: "부관부착맨홀" }, - { val: "SMU910", text: "조립식맨홀" }, - { val: "SMU911", text: "특1호" }, - { val: "SMU912", text: "특2호" }, - { val: "SMU913", text: "특3호" }, - { val: "SMU914", text: "특4호" }, - { val: "SMU915", text: "특5호" }, - { val: "SMU916", text: "하수맨홀용도" }, - { val: "SMU917", text: "현장타설관거용" } -]; -// 우수펌프장 -export const ExclnSewagePumpCol = [ +// 하수펌프장 +export const SewagePump = [ // { id: 'fid', title: 'FID' }, // { id: 'geom', title: 'geometry' }, // { id: 'ftreSmbolCd', title: '지형지물부호코드' }, @@ -276,17 +213,17 @@ export const ExclnSewagePumpCol = [ // { id: 'mngInstCd', title: '관리기관코드' }, { id: 'instl_ymd', title: '설치일자' }, { id: 'swage_pmstn_nm', title: '하수펌프장명' }, - { id: 'plln_area', title: '부지면적(m²)' }, - // { id: 'opngSttsCd', title: '개통상태코드' }, + { id: 'plln_area', title: '부지면적' }, + // { id: 'opngSttsCd', title: '개통상태코드' }, // { id: 'usgCd', title: '용도코드' }, - { id: 'daily_prcs_cpct', title: '일일처리용량(㎥)' }, - { id: 'max_impnd_cpct', title: '최대저수용량(㎥)' }, - { id: 'altd_vl', title: '표고(EL.m)' }, - { id: 'wtlv_vl', title: '수위(m)' }, - { id: 'excln_wpmp_ablt', title: '우수양수능력(m²/d)' }, + { id: 'daily_prcs_cpct', title: '일일처리용량' }, + { id: 'max_impnd_cpct', title: '최대저수용량' }, + { id: 'altd_vl', title: '표고' }, + { id: 'wtlv_vl', title: '수위' }, + { id: 'excln_wpmp_ablt', title: '우수양수능력' }, // { id: 'instMngNo', title: '기관관리번호' }, ] -export const ExclnSewagePumpCol2 = [ +export const SewagePump2 = [ // { id: 'fid', title: 'FID' }, // { id: 'geom', title: 'geometry' }, // { id: 'ftreSmbolCd', title: '지형지물부호코드' }, @@ -296,56 +233,14 @@ export const ExclnSewagePumpCol2 = [ // { id: 'mngInstCd', title: '관리기관코드' }, { id: 'instlYmd', title: '설치일자' }, { id: 'swagePmstnNm', title: '하수펌프장명' }, - { id: 'pllnArea', title: '부지면적(m²)' }, + { id: 'pllnArea', title: '부지면적' }, // { id: 'opngSttsCd', title: '개통상태코드' }, // { id: 'usgCd', title: '용도코드' }, - { id: 'dailyPrcsCpct', title: '일일처리용량(㎥)' }, - { id: 'max_impndCpct', title: '최대저수용량(㎥)' }, - { id: 'altdVl', title: '표고(EL.m)' }, - { id: 'wtlvVl', title: '수위(m)' }, - { id: 'exclnWpmpAblt', title: '우수양수능력(m²/d)' }, - // { id: 'instMngNo', title: '기관관리번호' }, -] - -// 오수펌프장 -export const DrtwSewagePumpCol1 = [ - // { id: 'fid', title: 'FID' }, - // { id: 'geom', title: 'geometry' }, - // { id: 'ftreSmbolCd', title: '지형지물부호코드' }, - { id: 'fclt_mng_no', title: '시설관리번호' }, - // { id: 'pbadmsEmdCd', title: '행정읍면동코드' }, - { id: 'mapsht_no', title: '도엽번호' }, - // { id: 'mngInstCd', title: '관리기관코드' }, - { id: 'instl_ymd', title: '설치일자' }, - { id: 'swage_pmstn_nm', title: '하수펌프장명' }, - { id: 'plln_area', title: '부지면적(m²)' }, - // { id: 'opngSttsCd', title: '개통상태코드' }, - // { id: 'usgCd', title: '용도코드' }, - { id: 'daily_prcs_cpct', title: '일일처리용량(㎥)' }, - { id: 'max_impnd_cpct', title: '최대저수용량(㎥)' }, - { id: 'altd_vl', title: '표고(EL.m)' }, - { id: 'wtlv_vl', title: '수위(m)' }, - { id: 'excln_wpmp_ablt', title: '오수양수능력(m²/d)' }, - // { id: 'instMngNo', title: '기관관리번호' }, -] -export const DrtwSewagePumpCol2 = [ - // { id: 'fid', title: 'FID' }, - // { id: 'geom', title: 'geometry' }, - // { id: 'ftreSmbolCd', title: '지형지물부호코드' }, - { id: 'fcltMngNo', title: '시설관리번호' }, - // { id: 'pbadmsEmdCd', title: '행정읍면동코드' }, - { id: 'mapshtNo', title: '도엽번호' }, - // { id: 'mngInstCd', title: '관리기관코드' }, - { id: 'instlYmd', title: '설치일자' }, - { id: 'swagePmstnNm', title: '하수펌프장명' }, - { id: 'pllnArea', title: '부지면적(m²)' }, - // { id: 'opngSttsCd', title: '개통상태코드' }, - // { id: 'usgCd', title: '용도코드' }, - { id: 'dailyPrcsCpct', title: '일일처리용량(㎥)' }, - { id: 'max_impndCpct', title: '최대저수용량(㎥)' }, - { id: 'altdVl', title: '표고(EL.m)' }, - { id: 'wtlvVl', title: '수위(m)' }, - { id: 'exclnWpmpAblt', title: '오수양수능력(m²/d)' }, + { id: 'dailyPrcsCpct', title: '일일처리용량' }, + // { id: 'max_impndCpct', title: '최대저수용량' }, + { id: 'altdVl', title: '표고' }, + { id: 'wtlvVl', title: '수위' }, + { id: 'exclnWpmpAblt', title: '우수양수능력' }, // { id: 'instMngNo', title: '기관관리번호' }, ] @@ -358,11 +253,11 @@ export const stofcbrCol = [ // { id: 'mng_inst_cd', title: '관리기관코드' }, { id: 'instl_ymd', title: '설치일자' }, // { id: 'fclty_shp_cd', title: '시설물형태코드' }, - { id: 'worflw_wall_hgt', title: '월류벽높이(m)' }, + { id: 'worflw_wall_hgt', title: '월류벽높이' }, // { id: 'mhl_exst_yn_cd', title: '맨홀존재여부코드' }, // { id: 'swage_mhl_ftre_smbol_cd', title: '하수맨홀지형지물부호코드' }, { id: 'swage_mhl_mng_no', title: '하수맨홀관리번호' }, - { id: 'drtn_angl', title: '방향각도(°)' }, + { id: 'drtn_angl', title: '방향각도' }, ] export const stofcbrCol2 = [ // { id: 'ftre_smbol_cd', title: '지형지물부호코드' }, @@ -372,11 +267,11 @@ export const stofcbrCol2 = [ // { id: 'mng_inst_cd', title: '관리기관코드' }, { id: 'instlYmd', title: '설치일자' }, // { id: 'fclty_shp_cd', title: '시설물형태코드' }, - { id: 'worflwWallHgt', title: '월류벽높이(m)' }, + { id: 'worflwWallHgt', title: '월류벽높이' }, // { id: 'mhl_exst_yn_cd', title: '맨홀존재여부코드' }, // { id: 'swage_mhl_ftre_smbol_cd', title: '하수맨홀지형지물부호코드' }, { id: 'swageMhlMngNo', title: '하수맨홀관리번호' }, - { id: 'drtnAngl', title: '방향각도(°)' }, + { id: 'drtnAngl', title: '방향각도' }, ] // 중점우수토실 측정지점 @@ -392,7 +287,7 @@ export const untrtSwgRainCol1 = [ // 중점우수토실 측정지점 시설현황 export const untrtSwgRainCol2 = [ { id: 'flwmtr_mesure_tp_etc', title: '구분' }, - { id: 'discharge_pipe_spec', title: '방류관로 규격(m)' }, + { id: 'discharge_pipe_spec', title: '방류관로 규격' }, { id: 'swr_ppl_eqp_ar', title: '배수구역 면적(m²)' }, { id: 'swr_trt_popl', title: '하수처리 인구(인)' }, { id: 'screen_instl_at', title: '스크린설치 여부' }, diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx index 26b3a60aa..46537a7dd 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx @@ -7,7 +7,7 @@ import { handleInputChange } from '../common'; // 하수관로 const inputColumn = [ { id: "title", title: "설치주제", type: "select", options: ["BTL", "재정사업"] }, - { id: "swtrmt_zone_cd", title: "처리구역", type: "input" }, + { id: "swtrmt_zone_cd", title: "처리구역", type: "select", options: ["구역1", "구역2"] }, { id: "basu", title: "배수구역", type: "input" }, { id: "mltv_dtdv_nm", title: "배수분구", type: "input" }, { id: "wltjs", title: "지선/간선", type: "select", options: ["지선", "간선"] }, diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/Ssc.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/Ssc.tsx index 31aef5172..7e22ea03b 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/Ssc.tsx +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/Ssc.tsx @@ -3,19 +3,12 @@ import { UiModal, UiTable } from '@common/business_components/ui'; import { Button, TableHead, TableRow } from '@common/components/ui'; import React, { useState } from 'react'; import { untrtSwgRainCol3, untrtSwgRainCol4, untrtSwgRainCol5 } from '../common/table'; -import { VerticalTable } from '@/components/ui/verticalTable'; import LoadingOverlay from '@/components/ui/LoadingBar'; -const inputColumn = [ - { id: "place", title: "중점여부", type: "select", options: ["중점우수토실", "우수토실"] }, - { id: "guyeok", title: "처리구역", type: "input" }, -]; - -const Ssc = ({ featureData, chkMainSsc, additionalData, onSaveClick }: { +const Ssc = ({ featureData, chkMainSsc, additionalData }: { featureData: any, chkMainSsc?: boolean, - additionalData?: any, - onSaveClick?: () => void + additionalData?: any }) => { const [isModalOpen, setIsModalOpen] = useState(false); const [isDataLoaded, setIsDataLoaded] = useState(false); @@ -100,7 +93,7 @@ const Ssc = ({ featureData, chkMainSsc, additionalData, onSaveClick }: { return (
- + /> */} {chkMainSsc && (
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx index f0c4d21b3..4eaf1f18d 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx @@ -1,22 +1,17 @@ import { VerticalTable } from '@/components/ui/verticalTable'; import React from 'react' -const exclnInputColumn = [ - { id: "swtrmt_zone_cd", title: "배수구역", type: "input" }, +const inputColumn = [ + { id: "swtrmt_zone_cd", title: "처리구역", type: "select", options: ["구역1", "구역2"] }, { id: "mltv_dtdv_nm", title: "배수분구", type: "input" }, - { id: "freq", title: "설계빈도(년)", type: "input" }, + { id: "freq", title: "설계빈도", type: "input" }, ] -const drtwInputColumn = [ - { id: "swtrmt_zone_cd", title: "배수구역", type: "input" }, - { id: "mltv_dtdv_nm", title: "배수분구", type: "input" }, -] - // 하수펌프장 const sewagePump = ({ featureData, onSaveClick }: { featureData: any, onSaveClick?: () => void }) => { return ( void }) => { return ( diff --git a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx index 72831902f..16c4f99a8 100644 --- a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx +++ b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx @@ -6,7 +6,7 @@ import { useGisContext } from "@common/business_components/ui/map/Gis"; import { Button } from "@common/components/ui"; import { useEffect, useRef, useState, useCallback, useMemo } from "react"; import { getLayerContentComponent } from "./components/common"; -import { SwtrmtFcltCol, SwtrmtPrcsZoneCol, untrtSwgRainCol1, untrtSwgRainCol2, MsSwagePplCol, ExclnSewagePumpCol, MsSwageMhlCol, stofcbrCol, MS_SWAGE_MHL_CODES } from "./components/common/table"; +import { SwtrmtFcltCol, SwtrmtPrcsZoneCol, untrtSwgRainCol1, untrtSwgRainCol2, MsSwagePplCol, SewagePump, MsSwageMhlCol, stofcbrCol } from "./components/common/table"; import InfilChart from './components/popupComponent/chart/infilChart'; import RdiiChart from './components/popupComponent/chart/rdiiChart'; import { useInfilChartModalStore, useRdiiChartModalStore } from "./components/popupComponent/chartModalStore"; @@ -29,8 +29,8 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void, const [isAdditionalDataLoading, setIsAdditionalDataLoading] = useState(false); const [additionalDataError, setAdditionalDataError] = useState(null); // 🎯 InfilChart 및 RdiiChart 관련 상태 추가 - const { setIsOpen: setIsModalInfil } = useInfilChartModalStore(); - const { setIsOpen: setIsModalRdii } = useRdiiChartModalStore(); + const { setIsOpen:setIsModalInfil } = useInfilChartModalStore(); + const { setIsOpen:setIsModalRdii } = useRdiiChartModalStore(); // 🎯 관로관리번호 추출 const pplMngNo = featureData?.values_?.fclt_mng_no || ""; @@ -135,27 +135,8 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void, console.log('gis data', featureData.values_); let data = featureData.values_; - - // 하수맨홀인 경우 용도코드를 텍스트로 변환 - if (selectedLayerName === '하수맨홀' && data) { - const processedData = { ...data }; - - // mqlt_cd 값 변환 (재질코드) - if (processedData.mqlt_cd) { - const materialCodeItem = MS_SWAGE_MHL_CODES.find( - code => code.val === processedData.mqlt_cd.trim() - ); - if (materialCodeItem) { - processedData.mqlt_cd = `${materialCodeItem.text}`; - } - } - - setfetchData(processedData); - setTableData(processedData); - } else { - setfetchData(data); - setTableData(data); - } + setfetchData(data) + setTableData(data); switch (selectedLayerName) { case '하수처리시설': @@ -192,7 +173,6 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void, case '우수토실': setHeadlist(stofcbrCol) setButtonChk(false) - setChkMainSsc(false) break; case '하수관로': setHeadlist(MsSwagePplCol) @@ -205,7 +185,7 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void, // setButtonChk(true) // break; case '하수펌프장': - setHeadlist(ExclnSewagePumpCol) + setHeadlist(SewagePump) setButtonChk(true) break; case '하수맨홀': @@ -257,41 +237,32 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void, setIsModalOpen(false); // 모달 닫기 }; - // 저장 버튼 이벤트 const btnClickEvent = async () => { const bodyData: Record = {} - if (buttonChk && contentRef.current) { const inputElements = contentRef.current.querySelectorAll('input'); const selectElements = contentRef.current.querySelectorAll('select'); - // 카멜케이스 변환 함수 const toCamelCase = (str: string) => str.replace(/_([a-z])/g, (_, char) => char.toUpperCase()); - // select 태그의 값 가져오기 selectElements.forEach((select) => { const camelCaseId = toCamelCase(select.id); bodyData[camelCaseId] = select.value; }); - // input 태그의 값 가져오기 inputElements.forEach((input) => { const camelCaseId = toCamelCase(input.id); bodyData[camelCaseId] = input.value; }); - if (layerNm === '하수관로') bodyData['lyrTypeNm'] = 'tb_ms_swage_ppl' else if (layerNm === '우수토실') bodyData['lyrTypeNm'] = 'tb_ms_stofcbr' else if (layerNm === '중점우수토실') bodyData['lyrTypeNm'] = 'om_dt_untrt_swg_rain' else if (layerNm === '오수펌프') bodyData['lyrTypeNm'] = 'tb_ms_swage_pmstn' else if (layerNm === '빗물펌프') bodyData['lyrTypeNm'] = 'tb_ms_swage_pmstn' else if (layerNm === '하수맨홀') bodyData['lyrTypeNm'] = 'tb_ms_swage_mnhl' - bodyData['fid'] = featureId - const data = await putData(`v1/fclts/${featureId}`, bodyData); - if (data.status == 200) { alert('저장되었습니다') setTableData(data) @@ -315,13 +286,13 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void, {/* 🎯 하수관로일 때만 Infil/RDII 버튼 표시 */} {layerNm === '하수관로' && ( <> - -
) } diff --git a/apps/sn/app/(with-base-layout)/oper/floodPre/page.tsx b/apps/sn/app/(with-base-layout)/oper/floodPre/page.tsx index 3578ff967..6ae0b3609 100644 --- a/apps/sn/app/(with-base-layout)/oper/floodPre/page.tsx +++ b/apps/sn/app/(with-base-layout)/oper/floodPre/page.tsx @@ -27,16 +27,16 @@ const Page = () => { const [curPage, setCurPage] = useState(1) //현재 페이지 const [totalData, setTotalData] = useState(0) //총 데이터 수 const [isLoading, setIsLoading] = useState(true) //로딩 상태 - - // 조회 const fetchData = async () => { setIsLoading(true) - // searchCmmnCd('SITEKNDCD') + searchCmmnCd('SITEKNDCD') try { const { data, total } = await searchData('v1/sbmrgPrevnt', { fromRegDt: formatDate(fromDate), + fromMngYr: manageYear, + toMngYr: mngQu, toRegDt: formatDate(toDate), - sbmrgPrevntBizNm: pjNm, + atflNm: pjNm, rgtrNm: usr, page: curPage - 1, size: '10' @@ -45,18 +45,12 @@ const Page = () => { setTotalData(total) } catch (error) { console.error('Error fetching data:', error) } - finally { - setFileNm(''); - setAtflId(''); - setSbmrgPrevntBizSn(''); - setIsLoading(false); - } + finally { setIsLoading(false); } } useEffect(() => { setCurPage(1) fetchData() }, []) - // 파일 다운로드 const isChckFile = () => { if (fileNm === '' || fileNm === undefined) { @@ -65,7 +59,6 @@ const Page = () => { } handleDownload(`/attach-service/api/v1/download/${atflId}`, fileNm) } - // 선택 파일 삭제 const isDeleteFile = async () => { if (sbmrgPrevntBizSn === '' || sbmrgPrevntBizSn === undefined) { @@ -103,19 +96,11 @@ const Page = () => { { if (date) setFromDate(date) }} - modifiers={{ - disabled: { after: new Date() } - }} - /> + onSelect={(date: Date | undefined) => { if (date) setFromDate(date) }} /> ~ { if (date) setToDate(date) }} - modifiers={{ - disabled: { after: new Date() } - }} - /> + onSelect={(date: Date | undefined) => { if (date) setToDate(date) }} />
@@ -147,23 +132,7 @@ const Page = () => {
- { - if (index != null) { - const fileName = tableData[index]?.sbmrgPrevntBizNm ?? ""; - const id = tableData[index]?.atflId ?? ''; - setFileNm(fileName); - setAtflId(id); - setSbmrgPrevntBizSn(tableData[index]?.sbmrgPrevntBizSn); - } - }} - onPageChange={async (page: number) => { setCurPage(page); await fetchData() }} - /> + { if (index != null) { const fileName = tableData[index]?.sbmrgPrevntBizNm ?? ""; setFileNm(fileName); const id = tableData[index]?.atflId ?? ''; setAtflId(id); setSbmrgPrevntBizSn(tableData[index]?.sbmrgPrevntBizSn); } }} onPageChange={async (page: number) => { setCurPage(page); await fetchData() }}> { await registFile(file, year, quater, cd, id) }} /> diff --git a/apps/sn/app/(with-base-layout)/oper/oldPp/page.tsx b/apps/sn/app/(with-base-layout)/oper/oldPp/page.tsx index c4bac35b7..307452e2d 100644 --- a/apps/sn/app/(with-base-layout)/oper/oldPp/page.tsx +++ b/apps/sn/app/(with-base-layout)/oper/oldPp/page.tsx @@ -25,13 +25,14 @@ const Page = () => { const [curPage, setCurPage] = useState(1) const [totalData, setTotalData] = useState(0) //총 데이터 수 const [isLoading, setIsLoading] = useState(true) //로딩 상태 - // 데이터 조회 const fetchData = async () => { setIsLoading(true) try { const { data, total } = await searchData('v1/dcrpPpl', { fromRegDt: formatDate(fromDate), + fromMngYr: manageYear, + toMngYr: mngQu, toRegDt: formatDate(toDate), dcrpPplMtncBizNm: pjNm, rgtrNm: usr, @@ -43,18 +44,12 @@ const Page = () => { console.log(data, total) } catch (error) { console.error('Error fetching data:', error) - } finally { - setFileNm(''); - setAtflId(''); - setDcrpPplMtncBizSn(''); - setIsLoading(false) - } + } finally { setIsLoading(false) } } useEffect(() => { setCurPage(1) fetchData() }, []) - // 파일 다운로드 const isChckFile = () => { if (fileNm === '' || fileNm === undefined) { @@ -64,7 +59,6 @@ const Page = () => { handleDownload(`/attach-service/api/v1/download/${atflId}`, fileNm) return true } - // 파일 삭제 const isDeleteFile = async () => { if (dcrpPplMtncBizSn === '' || dcrpPplMtncBizSn === undefined) { @@ -82,7 +76,6 @@ const Page = () => { } } } - // 파일 등록 const registFile = async (fileNm: string, year: string, quater: string, cd: string, id: string) => { const data = await postData('v1/dcrpPpl', { @@ -95,8 +88,6 @@ const Page = () => { }) if (data) { alert('파일이 등록되었습니다.'); fetchData() } } - - return ( <> @@ -107,17 +98,11 @@ const Page = () => { { if (date) setFromDate(date) }} - modifiers={{ - disabled: { after: new Date() } - }} /> + onSelect={(date: Date | undefined) => { if (date) setFromDate(date) }} /> ~ { if (date) setToDate(date) }} - modifiers={{ - disabled: { after: new Date() } - }} /> + onSelect={(date: Date | undefined) => { if (date) setToDate(date) }} />
{
- { - if (index != null) { - const fileName = tableData[index]?.dcrpPplMtncBizNm ?? ""; - const id = tableData[index]?.atflId ?? ''; - setFileNm(fileName); - setAtflId(id); - setDcrpPplMtncBizSn(tableData[index]?.dcrpPplMtncBizSn); - } - }} - onPageChange={async (page: number) => { setCurPage(page); await fetchData() }} - /> + { if (index != null) { const fileName = tableData[index]?.dcrpPplMtncBizNm ?? ""; setFileNm(fileName); const id = tableData[index]?.atflId ?? ''; setAtflId(id); setDcrpPplMtncBizSn(tableData[index]?.dcrpPplMtncBizSn) } }} onPageChange={async (page: number) => { setCurPage(page); await fetchData() }}> { await registFile(file, year, quater, cd, id) }} /> diff --git a/apps/sn/app/components/ui/fileUploadForm.tsx b/apps/sn/app/components/ui/fileUploadForm.tsx index fb626348e..3cd663e01 100644 --- a/apps/sn/app/components/ui/fileUploadForm.tsx +++ b/apps/sn/app/components/ui/fileUploadForm.tsx @@ -29,8 +29,6 @@ const FileUploadForm = ({ const [files, setFiles] = useState(null); const [upload, setUpload] = useState(null); const uniqueId = useId(); // 각 FileUploadForm 인스턴스에 대한 고유 ID 생성 - // FileUploader 컴포넌트를 강제로 재마운트하기 위한 key 상태 추가 - const [uploaderKey, setUploaderKey] = useState(0); const quater = [{ text: '1분기', val: '1' }, { text: '2분기', val: '2' }, { text: '3분기', val: '3' }, { text: '4분기', val: '4' }]; // 현재 년도부터 10년 전까지의 년도 옵션 생성 @@ -66,7 +64,6 @@ const FileUploadForm = ({
{/* FileUploader와 Button을 정렬하는 메인 flex 컨테이너 */}
{/* FileUploader의 너비와 오른쪽 여백을 제어하는 컨테이너 */} prev + 1); } }} > diff --git a/apps/sn/app/components/ui/verticalTable.tsx b/apps/sn/app/components/ui/verticalTable.tsx index 19e302c30..1455c9e4a 100644 --- a/apps/sn/app/components/ui/verticalTable.tsx +++ b/apps/sn/app/components/ui/verticalTable.tsx @@ -141,7 +141,7 @@ export function VerticalTable({ handleInputChange(head.id, e.target.value)} className="w-full text-xl border-radius-0 border border-gray-300 rounded-sm px-2 py-1" /> diff --git a/packages/common/business_components/src/ui/chart/BarChart.tsx b/packages/common/business_components/src/ui/chart/BarChart.tsx index 02d3a7c60..0802a72e4 100644 --- a/packages/common/business_components/src/ui/chart/BarChart.tsx +++ b/packages/common/business_components/src/ui/chart/BarChart.tsx @@ -75,7 +75,7 @@ const CustomLegend = (props: any) => { }; export default function Chart({chartConfig=undefined, chartData=[], chartTitle='차트', chartClassName='w-full h-full', graphSize=40, yFieldText='', showLegend=false} : BarChartProps) { - const colors = ["#FF6B6B", "#4ECDC4", "#45B7D1", "#FED16A", "#FFEEAD", "#D4A5A5"]; + const colors = ["#FF6B6B", "#4ECDC4", "#45B7D1", "#96CEB4", "#FFEEAD", "#D4A5A5"]; const getMaxValue = (data: any[], keyPrefix: string) => { return Math.max(...data.map(item => Object.keys(item) diff --git a/packages/common/business_components/src/ui/sdmInsertForm/form.tsx b/packages/common/business_components/src/ui/sdmInsertForm/form.tsx index a42dea012..2d7d2bf90 100644 --- a/packages/common/business_components/src/ui/sdmInsertForm/form.tsx +++ b/packages/common/business_components/src/ui/sdmInsertForm/form.tsx @@ -1,5 +1,4 @@ -import React from 'react'; -import { FormField } from "../form"; +import { FormField } from "../form"; import { SelectBox } from "../select"; import { Input } from "@common/components"; import { FormUi } from "../form_ui"; @@ -56,7 +55,6 @@ interface FormSchema { bznmTotNo?: string; rgtr?: string; dmdAplyPswd?: string; - dmdAplyPswdConfirm?: string; } interface SdmRegFormProps { @@ -87,25 +85,10 @@ export function SdmRegForm({ form, onCheckboxChange, selectSidoData, selectSigun const formatter = new AsYouType("KR"); const formatted = formatter.input(input); - return formatted - }; + // 저장할 값 처리: 숫자만 추출 + const digitsOnly = input.replace(/\D/g, ""); - // 사업자등록번호 포맷팅 함수 (3-2-5 형식) - const formatBusinessNumber = (value: string) => { - // 숫자만 추출 - const digitsOnly = value.replace(/\D/g, ""); - - // 10자리까지만 처리 - const limitedDigits = digitsOnly.slice(0, 10); - - // 3-2-5 형식으로 포맷팅 - if (limitedDigits.length <= 3) { - return limitedDigits; - } else if (limitedDigits.length <= 5) { - return `${limitedDigits.slice(0, 3)}-${limitedDigits.slice(3)}`; - } else { - return `${limitedDigits.slice(0, 3)}-${limitedDigits.slice(3, 5)}-${limitedDigits.slice(5)}`; - } + return formatted }; @@ -196,15 +179,12 @@ export function SdmRegForm({ form, onCheckboxChange, selectSidoData, selectSigun const value = e.target.value; if(noType === 'dmdInfoPk') { - // 숫자만 추출하여 저장 (포맷팅 제거) - const digitsOnly = value.replace(/\D/g, ""); - - if(orgBznmNo.substring(0,10) === digitsOnly) { + if(orgBznmNo.substring(0,10) === value) { setIsDuplicate(true); } else { setIsDuplicate(false); } - field?.onChange(digitsOnly); + field?.onChange(value); } else { if(orgBznmNo.substring(10,14) === value) { setIsDuplicate(true); @@ -316,7 +296,7 @@ export function SdmRegForm({ form, onCheckboxChange, selectSidoData, selectSigun type="text" className="!text-xl text-gray-600" onChange={(e) => bznNoChange(e, 'dmdInfoPk', field)} - value={formatBusinessNumber(field.value || '')} + value={field.value} readOnly={!!updateList?.dmdInfoPk} /> ) @@ -388,60 +368,32 @@ export function SdmRegForm({ form, onCheckboxChange, selectSidoData, selectSigun {...field} /> ) - }, - { - name: "dmdAplyPswdConfirm", - label: "패스워드확인", - component: (field) => ( - - ) } ] return ( <> - {formFields - .filter(({ name }) => !(updateList?.dmdInfoPk && (name === "dmdAplyPswd" || name === "dmdAplyPswdConfirm"))) - .map(({ name, label, component }) => { - const error = form.formState.errors[name]; - const inputId = `${name}-input`; - const errorId = `${name}-error`; - const isRequired = ["ctpvCd", "sggCd", "dmdCoNm", "dmdInfoPk", "daddr", "telno", "dmdAplyPswd", "dmdAplyPswdConfirm"].includes(name); - - return ( - ( -
- - - {React.cloneElement(component(field), { - id: inputId, - "aria-required": isRequired, - "aria-invalid": !!error, - "aria-describedby": error ? errorId : undefined - })} - - {error?.message && ( - - )} -
- )} - /> - ); - })} + {formFields.filter((item)=> + {if(updateList?.dmdInfoPk){ + return item.name !== 'dmdAplyPswd' + }else{ + return item + } + }) + .map(({ name, label, component }) => ( + ( + name === 'bznmTotNo' ? component(field) : ( + + {component(field)} + + ) + )} + /> + ))} ); } \ No newline at end of file diff --git a/packages/common/business_components/src/ui/sdmInsertForm/index.tsx b/packages/common/business_components/src/ui/sdmInsertForm/index.tsx index c564b63dd..4219602e6 100644 --- a/packages/common/business_components/src/ui/sdmInsertForm/index.tsx +++ b/packages/common/business_components/src/ui/sdmInsertForm/index.tsx @@ -47,17 +47,7 @@ const createFormSchema = (isBznmTotNoDisabled: boolean, isDuplicate: boolean ,up ? z.string().optional() // 패스워드는 선택 사항이며 길이 제한 없음 : z.string().optional() .refine((val) => !val || (val.length >= 8 && val.length <= 16), "패스워드는 8자 이상 16자 이내로 입력해주세요"), - dmdAplyPswdConfirm: z.string() - .min(1, "패스워드확인을 입력해주세요"), -}).refine((data) => { - // 패스워드 확인 검증 - if (data.dmdAplyPswd && data.dmdAplyPswdConfirm) { - return data.dmdAplyPswd === data.dmdAplyPswdConfirm; - } - return true; -}, { - message: "패스워드가 일치하지 않습니다", - path: ["dmdAplyPswdConfirm"], // 에러를 패스워드 확인 필드에 표시 + }); type FormSchema = z.infer>; @@ -72,7 +62,6 @@ const defaultValues: FormSchema = { telno: '', rgtr: '', dmdAplyPswd: '', - dmdAplyPswdConfirm: '', }; /** @@ -160,7 +149,7 @@ export default function SdmInsertForm({selectSidoData, selectSigunData, dataList console.log(' formData ', formData) /* await insertSdmData(formData); */ - rtnInputData(formData as unknown as DemandCompType); + rtnInputData(formData as DemandCompType); //router.push(`/pages/sdmMng/sdmInfoInsert?${queryParams.toString()}`); diff --git a/packages/common/business_components/src/ui/sdmInsertForm/sdmNameBox.tsx b/packages/common/business_components/src/ui/sdmInsertForm/sdmNameBox.tsx index 059d63d90..3c8fd7192 100644 --- a/packages/common/business_components/src/ui/sdmInsertForm/sdmNameBox.tsx +++ b/packages/common/business_components/src/ui/sdmInsertForm/sdmNameBox.tsx @@ -1,14 +1,14 @@ -import React, { useCallback, useEffect, useRef, useState } from "react"; -import type { DemandCompType } from "./form"; +import React, { useCallback, useEffect, useRef, useState } from 'react'; +import type { DemandCompType } from './form'; export type thisProps = { label: string | undefined; initValue: string | undefined; - dataList: DemandCompType[]; - rtnValue: (searchText: string, pageCnt: number) => void; - rtnData: (item: DemandCompType) => void; - rtnText: (text: string) => void; -}; + dataList : DemandCompType[]; + rtnValue : (searchText: string, pageCnt: number) => void; + rtnData : (item: DemandCompType) => void; + rtnText : (text: string) => void; +} /** * 수요처 검색 컴포넌트 @@ -18,110 +18,88 @@ export type thisProps = { * @param dataList 검색할 때 넘기는 데이터 리스트 * @param rtnData 검색 결과 반환 함수 */ -export const SdmSearchForm = ({ - label = undefined, - initValue = undefined, - rtnValue = () => {}, - dataList = [], - rtnData = () => {}, - rtnText = () => {}, -}: thisProps) => { +export const SdmSearchForm = ({label=undefined, initValue=undefined, rtnValue=()=>{}, dataList=[], rtnData=()=>{}, rtnText=()=>{} } :thisProps) => { + const [isOpen, setIsOpen] = useState(false); - const [textValue, setTextValue] = useState(initValue || ""); + const [textValue, setTextValue] = useState(initValue || ''); const wrapperRef = useRef(null); - const handleInputChange = useCallback( - (e: React.ChangeEvent) => { - const value = e.target.value; - setTextValue(value); - rtnValue(value, 10); - rtnText(value); - if (value) { - setIsOpen(true); - } else { - setIsOpen(false); - } - }, - [rtnValue, rtnText], - ); - - const handleSuggestionClick = useCallback( - (item: DemandCompType) => { - setTextValue(item.dmdCoNm); - rtnData(item); + const handleInputChange = useCallback((e: React.ChangeEvent) => { + const value = e.target.value; + setTextValue(value); + rtnValue(value, 10); + rtnText(value); + if (value) { + setIsOpen(true); + } else { setIsOpen(false); - }, - [rtnData], - ); + } + }, [rtnValue, rtnText]); + + const handleSuggestionClick = useCallback((item: DemandCompType) => { + setTextValue(item.dmdCoNm); + rtnData(item); + setIsOpen(false); + }, [rtnData]); useEffect(() => { const handleClickOutside = (event: MouseEvent) => { - if ( - wrapperRef.current && - !wrapperRef.current.contains(event.target as Node) - ) { + if (wrapperRef.current && !wrapperRef.current.contains(event.target as Node)) { setIsOpen(false); } }; - document.addEventListener("mousedown", handleClickOutside); + document.addEventListener('mousedown', handleClickOutside); return () => { - document.removeEventListener("mousedown", handleClickOutside); + document.removeEventListener('mousedown', handleClickOutside); }; }, []); useEffect(() => { - if (initValue && initValue?.length > 0) { - setTextValue(initValue); + if(initValue&& initValue?.length>0){ + setTextValue(initValue) } - }, [initValue]); - + },[initValue]) + return ( -
+
setIsOpen(true)} */ - className="h-[3.2rem] w-full rounded-md border border-gray-300 pl-3 !text-xl text-gray-600 focus:outline-none focus:ring-2 focus:ring-blue-500" + className="w-full h-[3.2rem] !text-xl pl-3 text-gray-600 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500" placeholder={`${label}을(를) 입력하세요`} /> {isOpen && ( -
+
- {dataList && dataList.length > 0 ? ( - dataList.map((item: DemandCompType, index: number) => ( -
handleSuggestionClick(item)} - role="button" - tabIndex={0} - onKeyDown={(e) => { - if (e.key === "Enter" || e.key === " ") { - handleSuggestionClick(item); - } - }} - > - {item.dmdInfoPk.substring(10, 14) !== "0000" ? ( - <> - 사업자번호 : {" "} - {item.dmdInfoPk.substring(0, 10)}  - - 종사업자번호 :{" "} - {" "} - {item.dmdInfoPk.substring(10, 14)}  - - ) : ( - <> - 사업자번호 : {" "} - {item.dmdInfoPk.substring(0, 10)}  - - )} - {item.dmdCoNm} -
- )) - ) : ( -
+ {dataList && dataList.length > 0 ? dataList.map((item : DemandCompType, index : number) => ( +
handleSuggestionClick(item)} + role="button" + tabIndex={0} + onKeyDown={(e) => { + if (e.key === 'Enter' || e.key === ' ') { + handleSuggestionClick(item); + } + }} + > + {item.dmdInfoPk.substring(10,14) !== '0000' ? ( + <> + 사업자번호 : {item.dmdInfoPk.substring(0,10)}  + 종사업자번호 : {item.dmdInfoPk.substring(10,14)}  + + ) : ( + <> + 사업자번호 : {item.dmdInfoPk.substring(0,10)}  + + )} + {item.dmdCoNm} +
+ )) : ( +
검색 결과가 없습니다.
)} @@ -129,5 +107,5 @@ export const SdmSearchForm = ({
)}
- ); -}; + ) +} \ No newline at end of file diff --git a/packages/common/business_components/src/ui/search_form_left/index.tsx b/packages/common/business_components/src/ui/search_form_left/index.tsx index 4f36c078c..e7858df2a 100644 --- a/packages/common/business_components/src/ui/search_form_left/index.tsx +++ b/packages/common/business_components/src/ui/search_form_left/index.tsx @@ -199,7 +199,7 @@ function SearchFormLeft({ isShowPart = false, children, selectSidoData = [], sel setRtnSidoText(selectedSido?.text || ''); } initializeSigunData(val); - onSelectValue('0', 'sigun'); + onSelectValue(selectSigunData[0]?.val || '0', 'sigun'); break; case 'sigun': if (setRtnSigunValue) { diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index 01bb18ba2..fe720abc0 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -49,12 +49,6 @@ export function UiTable({ tableData, headlist, pageSize, total, headName, childr } }, [resetSelection]); - // 테이블 데이터가 변경될 때마다 선택된 행 초기화하는 useEffect 추가 - useEffect(() => { - // 새로운 데이터가 로드되면 선택 상태 초기화 - setIdx(-1); - }, [tableData]); - const handlePageChange = (page: number) => { setCur(page); onPageChange(page); @@ -89,7 +83,7 @@ export function UiTable({ tableData, headlist, pageSize, total, headName, childr ? handleCellClick(index, head.id)} key={`cell-${head.id}-${index}`} @@ -103,7 +97,7 @@ export function UiTable({ tableData, headlist, pageSize, total, headName, childr : handleCellClick(index, head.id)} key={`cell-${head.id}-${index}`} diff --git a/packages/common/business_components/src/ui/table/uiPageNations.tsx b/packages/common/business_components/src/ui/table/uiPageNations.tsx index ca1f8e0c0..891fc4c81 100644 --- a/packages/common/business_components/src/ui/table/uiPageNations.tsx +++ b/packages/common/business_components/src/ui/table/uiPageNations.tsx @@ -40,8 +40,7 @@ export default function UiPageNations(commonPageNationsProps: CommonPageNationsP { - e.preventDefault(); + onClick={() => { if (startPage > 1) handlePageChange(startPage - 1); }} /> @@ -54,9 +53,7 @@ export default function UiPageNations(commonPageNationsProps: CommonPageNationsP { - e.preventDefault(); - handlePageChange(pageNum)}} + onClick={() => handlePageChange(pageNum)} > {pageNum} @@ -68,8 +65,7 @@ export default function UiPageNations(commonPageNationsProps: CommonPageNationsP { - e.preventDefault(); + onClick={() => { if (endPage < totalPages) handlePageChange(endPage + 1); }} /> diff --git a/packages/common/components/src/ui/date-picker/index.tsx b/packages/common/components/src/ui/date-picker/index.tsx index 85c584e5f..919e22435 100644 --- a/packages/common/components/src/ui/date-picker/index.tsx +++ b/packages/common/components/src/ui/date-picker/index.tsx @@ -13,14 +13,12 @@ type DatePickerProps = { placeholder?: string; disabled?: boolean; selected?: Date; - zIndex?: number; // z-index prop 추가 } & React.ComponentProps; export function DatePicker({ className, placeholder = "날짜 선택", disabled, - zIndex, // zIndex prop 받기 ...props }: DatePickerProps) { return ( @@ -39,10 +37,7 @@ export function DatePicker({ )} - +