From 1cdbdd00d9aad369e46f412c248addb9afbb1ecc Mon Sep 17 00:00:00 2001 From: jsyang Date: Wed, 27 Aug 2025 17:44:38 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EC=97=91=EC=85=80=20=ED=97=A4=EB=8D=94=EC=97=90=20=EB=8B=A8?= =?UTF-8?q?=EC=9C=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/store/facilityPrecipitation/index.tsx | 16 ++-- apps/fo/app/store/facilityWaterQlty/index.tsx | 44 +++++------ apps/fo/app/store/flowRate/index.tsx | 26 +++---- apps/fo/app/store/planSewage/index.tsx | 22 +++--- apps/fo/app/store/processArea/index.tsx | 76 +++++++++---------- apps/fo/app/store/processFacility/index.tsx | 14 ++-- apps/fo/app/store/rdi/index.tsx | 32 ++++---- apps/fo/app/store/sewageOccur/index.tsx | 24 +++--- apps/fo/app/store/underWaterInput/index.tsx | 10 +-- apps/fo/app/store/underWaterInput/types.tsx | 10 +-- 10 files changed, 137 insertions(+), 137 deletions(-) diff --git a/apps/fo/app/store/facilityPrecipitation/index.tsx b/apps/fo/app/store/facilityPrecipitation/index.tsx index 47e9a1a1e..77a053fc5 100644 --- a/apps/fo/app/store/facilityPrecipitation/index.tsx +++ b/apps/fo/app/store/facilityPrecipitation/index.tsx @@ -49,11 +49,11 @@ export interface ExcelType { 시군구: string, 시설이름: string, 주소: string, - 시설용량: number, + "시설옹량(m³/일)": number, 관측소정보 : string, - 강우일 : number, - 강우영향일 : number, - 연간총강수량 : number, + "강우일(일)": number, + "강우영향일(일)": number, + "연간총강수량(mm)": number, } /**==================================== @@ -263,11 +263,11 @@ export const facilityPrecipitationReducer:(set:(fn: (state: FacilityPrecipitatio 시군구: item.gugun, 시설이름: item.bscFctNm, 주소: item.addr, - 시설용량: item.fctCpc, + "시설옹량(m³/일)": item.fctCpc, 관측소정보: item.stnKo, - 강우일: item.infoRnDay, - 강우영향일: item.rainEffectDay, - 연간총강수량: item.totalYearRain, + "강우일(일)": item.infoRnDay, + "강우영향일(일)": item.rainEffectDay, + "연간총강수량(mm)": item.totalYearRain, }) }) }else{ diff --git a/apps/fo/app/store/facilityWaterQlty/index.tsx b/apps/fo/app/store/facilityWaterQlty/index.tsx index c63d3f284..0eded855b 100644 --- a/apps/fo/app/store/facilityWaterQlty/index.tsx +++ b/apps/fo/app/store/facilityWaterQlty/index.tsx @@ -65,17 +65,17 @@ export interface ExcelType { 시군구: string, 시설이름: string, 주소: string, - 용량: number, - 유입BOD: string | '', - 유입TOC: string | '', - 유입SS: string | '', - 유입TN: string | '', - 유입TP: string | '', - 유출BOD: string | '', - 유출TOC: string | '', - 유출SS: string | '', - 유출TN: string | '', - 유출TP: string | '', + "시설용량(m³/일)": number, + "유입BOD(mg/L)": string | '', + "유입TOC(mg/L)": string | '', + "유입SS(mg/L)": string | '', + "유입TN(mg/L)": string | '', + "유입TP(mg/L)": string | '', + "유출BOD(mg/L)": string | '', + "유출TOC(mg/L)": string | '', + "유출SS(mg/L)": string | '', + "유출TN(mg/L)": string | '', + "유출TP(mg/L)": string | '', } /** @@ -463,17 +463,17 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType 시군구: item.sggNm, 시설이름: item.bscFctNm, 주소: item.addr, - 용량: item.fctCpc, - 유입BOD: item.inflAssctBfrWqltBod, - 유입TOC: item.inflAssctBfrWqltToc, - 유입SS: item.inflAssctBfrWqltSs, - 유입TN: item.inflAssctBfrWqltTn, - 유입TP: item.inflAssctBfrWqltTp, - 유출BOD: item.efflWqltBod, - 유출TOC: item.efflWqltToc, - 유출SS: item.efflWqltSs, - 유출TN: item.efflWqltTn, - 유출TP: item.efflWqltTp, + "시설용량(m³/일)": item.fctCpc, + "유입BOD(mg/L)": item.inflAssctBfrWqltBod, + "유입TOC(mg/L)": item.inflAssctBfrWqltToc, + "유입SS(mg/L)": item.inflAssctBfrWqltSs, + "유입TN(mg/L)": item.inflAssctBfrWqltTn, + "유입TP(mg/L)": item.inflAssctBfrWqltTp, + "유출BOD(mg/L)": item.efflWqltBod, + "유출TOC(mg/L)": item.efflWqltToc, + "유출SS(mg/L)": item.efflWqltSs, + "유출TN(mg/L)": item.efflWqltTn, + "유출TP(mg/L)": item.efflWqltTp, }); }); }else{ diff --git a/apps/fo/app/store/flowRate/index.tsx b/apps/fo/app/store/flowRate/index.tsx index c8cf3f504..a6580500d 100644 --- a/apps/fo/app/store/flowRate/index.tsx +++ b/apps/fo/app/store/flowRate/index.tsx @@ -37,17 +37,17 @@ export interface ExcelType { 권역:string|'', 단위유역:string|'', 중권역:string|'', + 환경청:string|'', 시도: string, 시군구: string, 시설이름: string, 주소: string, - 용량: number, - 총유입량: number | '', - 하수유입량: number | '', - 연계처리량: number | '', - 총인반류수량: number | '', - 방류량: number | '', - 환경청:string|'', + "시설용량(m³/일)": number, + "총유입량(m³/일)": number | '', + "하수유입량(m³/일)": number | '', + "연계처리량(m³/일)": number | '', + "총인반류수량(m³/일)": number | '', + "방류량(m³/일)": number | '', } export type modalExcelType = { @@ -293,12 +293,12 @@ export const flowRateSearchReducer:(set:(fn: (state: FlowRateSearchType) => Flow 시군구: item.gugun, 시설이름: item.bscFctNm, 주소: item.daddr, - 용량: item.fctCpc, - 총유입량: item.totInflAmnt, - 하수유입량: item.inflAmnt, - 연계처리량: item.sumFlow, - 총인반류수량: item.returnAmnt, - 방류량: item.efflAmnt, + "시설용량(m³/일)": item.fctCpc, + "총유입량(m³/일)": item.totInflAmnt, + "하수유입량(m³/일)": item.inflAmnt, + "연계처리량(m³/일)": item.sumFlow, + "총인반류수량(m³/일)": item.returnAmnt, + "방류량(m³/일)": item.efflAmnt, }); }); } diff --git a/apps/fo/app/store/planSewage/index.tsx b/apps/fo/app/store/planSewage/index.tsx index 36e5feb9f..ccf6c9d73 100644 --- a/apps/fo/app/store/planSewage/index.tsx +++ b/apps/fo/app/store/planSewage/index.tsx @@ -52,7 +52,7 @@ const upHeadList1:TableUpperProps[] = [ { id: "daddr", title: "주소", row:0, rowSpan:2 }, { id: "fctCpc", title: "시설용량(m³/일)", row:0, rowSpan:2, align:'right' }, { id: "spareCapacity", title: "여유용량(m³/일)", row:0, rowSpan:2, align:'right' }, - { id: "variableLoadPercent", title: "변동부하율", row:0, rowSpan:2, align:'right' }, + { id: "variableLoadPercent", title: "변동부하율(%)", row:0, rowSpan:2, align:'right' }, { id: "classifiedSewerPercent", title: "분류식화율(%)", row:0, rowSpan:2, align:'right' }, ]; @@ -65,7 +65,7 @@ const upHeadList2:TableUpperProps[] = [ { id: "daddr", title: "주소", row:0, rowSpan:2 }, { id: "fctCpc", title: "시설용량(m³/일)", row:0, rowSpan:2, align:'right' }, { id: "spareCapacity", title: "여유용량(m³/일)", row:0, rowSpan:2, align:'right' }, - { id: "variableLoadPercent", title: "변동부하율", row:0, rowSpan:2, align:'right' }, + { id: "variableLoadPercent", title: "변동부하율(%)", row:0, rowSpan:2, align:'right' }, { id: "classifiedSewerPercent", title: "분류식화율(%)", row:0, rowSpan:2, align:'right' }, ]; @@ -82,7 +82,7 @@ const upHeadList3:TableUpperProps[] = [ { id: "daddr", title: "주소", row:0, rowSpan:2 }, { id: "fctCpc", title: "시설용량(m³/일)", row:0, rowSpan:2, align:'right' }, { id: "spareCapacity", title: "여유용량(m³/일)", row:0, rowSpan:2, align:'right' }, - { id: "variableLoadPercent", title: "변동부하율", row:0, rowSpan:2, align:'right' }, + { id: "variableLoadPercent", title: "변동부하율(%)", row:0, rowSpan:2, align:'right' }, { id: "classifiedSewerPercent", title: "분류식화율(%)", row:0, rowSpan:2, align:'right' }, ]; @@ -113,10 +113,10 @@ export type ExcelType = { 시군구: string; 시설이름: string; 주소: string; - 시설용량: number; - 여유용량: number; - 변동부하율 : number; - 분류식화율 : number; + "시설용량(m³/일)": number; + "여유용량(m³/일)": number; + "변동부하율(%)" : number; + "분류식화율(%)" : number; } const dataFormSetting=(item : PlanSewageProps)=> { @@ -230,10 +230,10 @@ export const planSewageReducer:(set:(fn: (state: PlanSewageType) => PlanSewageTy 시도: item.sido, 시군구: item.gugun, 주소: item.daddr, - 시설용량: item.fctCpc, - 여유용량: item.spareCapacity, - 변동부하율: item.variableLoadPercent, - 분류식화율: item.classifiedSewerPercent, + "시설용량(m³/일)": item.fctCpc, + "여유용량(m³/일)": item.spareCapacity, + "변동부하율(%)": item.variableLoadPercent, + "분류식화율(%)": item.classifiedSewerPercent, }) }) } diff --git a/apps/fo/app/store/processArea/index.tsx b/apps/fo/app/store/processArea/index.tsx index dc3826fef..ccad3436e 100644 --- a/apps/fo/app/store/processArea/index.tsx +++ b/apps/fo/app/store/processArea/index.tsx @@ -63,25 +63,25 @@ export interface ExcelType { 시설코드: string, 시설명: string, 주소: string, - 시설용량: number | '', - 증설계획기존: number | '', - 증설계획현재: number | '', - 증설계획1단계: number | '', - 증설계획2단계: number | '', - 증설계획3단계: number | '', - 증설계획4단계: number | '', - 처리인구기존: number | '', - 처리인구현재: number | '', - 처리인구1단계: number | '', - 처리인구2단계: number | '', - 처리인구3단계: number | '', - 처리인구4단계: number | '', - 처리구역기존: number | '', - 처리구역현재: number | '', - 처리구역1단계: number | '', - 처리구역2단계: number | '', - 처리구역3단계: number | '', - 처리구역4단계: number | '', + "시설옹량(m³/일)": number | '', + "증설계획기존(m³/일)": number | '', + "증설계획현재(m³/일)": number | '', + "증설계획1단계(m³/일)": number | '', + "증설계획2단계(m³/일)": number | '', + "증설계획3단계(m³/일)": number | '', + "증설계획4단계(m³/일)": number | '', + "처리인구기존(인)": number | '', + "처리인구현재(인)": number | '', + "처리인구1단계(인)": number | '', + "처리인구2단계(인)": number | '', + "처리인구3단계(인)": number | '', + "처리인구4단계(인)": number | '', + "처리구역기존(km²)": number | '', + "처리구역현재(km²)": number | '', + "처리구역1단계(km²)": number | '', + "처리구역2단계(km²)": number | '', + "처리구역3단계(km²)": number | '', + "처리구역4단계(km²)": number | '', 처리구역: string | '' } @@ -385,25 +385,25 @@ export const processAreaReducer:(set:SetStateFunction)=>ProcessAreaActions=(set: 시설코드: item.swtrmtFcltCd, 시설명: item.swtrmtFcltNm, 주소: item.location, - 시설용량: item.fctCpc, - 증설계획기존: item.planSwageQntSumDt4, - 증설계획현재: item.planSwageQntSum, - 증설계획1단계: item.planSwageQntSumDc1, - 증설계획2단계: item.planSwageQntSumDc2, - 증설계획3단계: item.planSwageQntSumDc3, - 증설계획4단계: item.planSwageQntSumDc4, - 처리인구기존: item.swtrmtPpltnCntDt4, - 처리인구현재: item.swtrmtPpltnCnt, - 처리인구1단계: item.swtrmtPpltnCntDc1, - 처리인구2단계: item.swtrmtPpltnCntDc2, - 처리인구3단계: item.swtrmtPpltnCntDc3, - 처리인구4단계: item.swtrmtPpltnCntDc4, - 처리구역기존: item.swtrmtZoneAreaDt4, - 처리구역현재: item.swtrmtZoneArea, - 처리구역1단계: item.swtrmtZoneAreaDc1, - 처리구역2단계: item.swtrmtZoneAreaDc2, - 처리구역3단계: item.swtrmtZoneAreaDc3, - 처리구역4단계: item.swtrmtZoneAreaDc4, + "시설옹량(m³/일)": item.fctCpc, + "증설계획기존(m³/일)": item.planSwageQntSumDt4, + "증설계획현재(m³/일)": item.planSwageQntSum, + "증설계획1단계(m³/일)": item.planSwageQntSumDc1, + "증설계획2단계(m³/일)": item.planSwageQntSumDc2, + "증설계획3단계(m³/일)": item.planSwageQntSumDc3, + "증설계획4단계(m³/일)": item.planSwageQntSumDc4, + "처리인구기존(인)": item.swtrmtPpltnCntDt4, + "처리인구현재(인)": item.swtrmtPpltnCnt, + "처리인구1단계(인)": item.swtrmtPpltnCntDc1, + "처리인구2단계(인)": item.swtrmtPpltnCntDc2, + "처리인구3단계(인)": item.swtrmtPpltnCntDc3, + "처리인구4단계(인)": item.swtrmtPpltnCntDc4, + "처리구역기존(km²)": item.swtrmtZoneAreaDt4, + "처리구역현재(km²)": item.swtrmtZoneArea, + "처리구역1단계(km²)": item.swtrmtZoneAreaDc1, + "처리구역2단계(km²)": item.swtrmtZoneAreaDc2, + "처리구역3단계(km²)": item.swtrmtZoneAreaDc3, + "처리구역4단계(km²)": item.swtrmtZoneAreaDc4, 처리구역: item.trtDstr }); }); diff --git a/apps/fo/app/store/processFacility/index.tsx b/apps/fo/app/store/processFacility/index.tsx index 9a2572916..bb9fdb086 100644 --- a/apps/fo/app/store/processFacility/index.tsx +++ b/apps/fo/app/store/processFacility/index.tsx @@ -44,9 +44,9 @@ export interface ExcelType { 시군구: string, 시설이름: string, 주소: string, - 시설용량: number | '', - 계획유입수질: number | '', - 설계유입수질: number | '', + "시설용량(m³/일)": number | '', + "계획유입수질(mg/L)": number | '', + "설계유입수질(mg/L)": number | '', 공법: string, 가동개시일: string, 준공일: string, @@ -623,13 +623,13 @@ export const processFacilityReducer:(set:SetStateFunction)=>ProcessFacilityActio 시군구: item.gugun, 시설이름: item.bscFctNm, 주소: item.daddr, - 시설용량: item.fctCpc ? Number(item.fctCpc) : '', - 계획유입수질: item.plInflWqltBod ? Number(item.plInflWqltBod) : '', - 설계유입수질: item.dsInflWqltBod ? Number(item.dsInflWqltBod) : '', + "시설용량(m³/일)": item.fctCpc ? Number(item.fctCpc.toString().replaceAll(',','')) : '', + "계획유입수질(mg/L)": item.plInflWqltBod ? Number(item.plInflWqltBod) : '', + "설계유입수질(mg/L)": item.dsInflWqltBod ? Number(item.dsInflWqltBod) : '', 공법: item.trtFrfNm, 가동개시일: item.rnDt, 준공일: item.cmplDt, - 관리대행업자: item.mnstr, + 관리대행업자: item.trstOprEtpNm, }) }) } diff --git a/apps/fo/app/store/rdi/index.tsx b/apps/fo/app/store/rdi/index.tsx index 310130bb0..2c4997010 100644 --- a/apps/fo/app/store/rdi/index.tsx +++ b/apps/fo/app/store/rdi/index.tsx @@ -87,14 +87,14 @@ export interface ExcelType { 시군구: string, 시설명: string, 주소: string, - 시설용량: number, - 청천시유입하수량: string | number | '', - 하절기강우일최저유입BOD: number | '', - 하절기최저유입BOD유입유량: number | string | '', - 동절기청천시유입BOD: number | '', - RDII추정 : number | '', - RDII추정시일강수량 : number | '', - 강우시총추정유입량 : string | number | '', + "시설용량(m³/일)": number, + "청천시유입하수량(m³/일)": string | number | '', + "하절기강우일최저유입BOD(mg/L)": number | '', + "하절기최저유입BOD유입유량(m³/일)": number | string | '', + "동절기청천시유입BOD(mg/L)": number | '', + "RDII추정" : number | '', + "RDII추정시일강수량(mm)": number | '', + "강우시총추정유입량(m³/일)" : string | number | '', 적정여부 : string, } @@ -338,14 +338,14 @@ export const rdiReducer:(set:SetStateFunction)=>RdiActions=(set: SetStateFunctio 시도: item.sido, 시군구: item.sigungo, 주소: item.daddr, - 시설용량: item.fctCpc, - 청천시유입하수량: item.chungchunFlow, - 하절기강우일최저유입BOD: item.summerMinBodValue, - 하절기최저유입BOD유입유량: item.inflAmnt, - 동절기청천시유입BOD: item.winterAvgBodLowRainfall, - RDII추정: item.rdiiValue, - RDII추정시일강수량: item.infoRnDay, - 강우시총추정유입량: item.rainCalInflAmnt, + "시설용량(m³/일)": item.fctCpc, + "청천시유입하수량(m³/일)": item.chungchunFlow, + "하절기강우일최저유입BOD(mg/L)": item.summerMinBodValue, + "하절기최저유입BOD유입유량(m³/일)": item.inflAmnt, + "동절기청천시유입BOD(mg/L)": item.winterAvgBodLowRainfall, + "RDII추정": item.rdiiValue, + "RDII추정시일강수량(mm)": item.infoRnDay, + "강우시총추정유입량(m³/일)": item.rainCalInflAmnt, 적정여부: item.properYn, }); }); diff --git a/apps/fo/app/store/sewageOccur/index.tsx b/apps/fo/app/store/sewageOccur/index.tsx index d72718736..efc51a5af 100644 --- a/apps/fo/app/store/sewageOccur/index.tsx +++ b/apps/fo/app/store/sewageOccur/index.tsx @@ -52,12 +52,12 @@ export interface ExcelType { 시군구: string, 시설명: string, 주소: string, - 시설용량: number, - 물사용량: number | '', - 오수전환율: number | '', - 오수발생량추정: number | '', - 연간하수유입량: number | '', - 청천시하수유입량: number | '', + "시설용량(m³/일)": number, + "물사용량(m³/일)": number | '', + "오수전환율(%)": number | '', + "오수발생량추정(m³/일)": number | '', + "연간하수유입량(m³/일)": number | '', + "청천시하수유입량(m³/일)": number | '', } // 리스트 헤더 @@ -278,12 +278,12 @@ export const sewageOccurReducer:(set:any)=>SewageOccurActions=(set: any) => { 시도: item.sidoNm, 시군구: item.sggNm, 주소: item.daddr, - 시설용량: item.fctCpc, - 물사용량: item.waterUsage, - 오수전환율: item.swageChangePercent, - 오수발생량추정: item.estimationSewage, - 연간하수유입량 : item.sewageInputYear, - 청천시하수유입량 : item.sewageInputChungchun, + "시설용량(m³/일)": item.fctCpc, + "물사용량(m³/일)": item.waterUsage, + "오수전환율(%)": item.swageChangePercent, + "오수발생량추정(m³/일)": item.estimationSewage, + "연간하수유입량(m³/일)": item.sewageInputYear, + "청천시하수유입량(m³/일)": item.sewageInputChungchun, }); }); } diff --git a/apps/fo/app/store/underWaterInput/index.tsx b/apps/fo/app/store/underWaterInput/index.tsx index 569919615..cb80d1942 100644 --- a/apps/fo/app/store/underWaterInput/index.tsx +++ b/apps/fo/app/store/underWaterInput/index.tsx @@ -341,11 +341,11 @@ export const underWaterReducer:(set:(fn: (state: UnderWaterType) => UnderWaterTy 시군구: item.sggNm, 시설명: item.bscFctNm, 주소: item.daddr, - 시설용량: item.fctCpc, - 평균유입하수량 :item.inflAmnt, - 연간지하수유입량: item.underWaterInputYear, - 하절기지하수유입량: item.underWaterInputSummer, - 동절기지하수유입량: item.underWaterInputWinter, + "시설용량(m³/일)": item.fctCpc, + "평균유입하수량(m³/일)": item.inflAmnt, + "연간지하수유입량(m³/일)": item.underWaterInputYear, + "하절기지하수유입량(m³/일)": item.underWaterInputSummer, + "동절기지하수유입량(m³/일)": item.underWaterInputWinter, 적정여부: item.properYn, }); }); diff --git a/apps/fo/app/store/underWaterInput/types.tsx b/apps/fo/app/store/underWaterInput/types.tsx index 4e13e7c96..396bd631b 100644 --- a/apps/fo/app/store/underWaterInput/types.tsx +++ b/apps/fo/app/store/underWaterInput/types.tsx @@ -55,10 +55,10 @@ export interface ExcelType { 시군구: string, 시설명: string, 주소: string, - 시설용량: number, - 평균유입하수량 : number | '', - 연간지하수유입량: number | '', - 하절기지하수유입량: number | '', - 동절기지하수유입량: number | '', + "시설용량(m³/일)": number, + "평균유입하수량(m³/일)": number | '', + "연간지하수유입량(m³/일)": number | '', + "하절기지하수유입량(m³/일)": number | '', + "동절기지하수유입량(m³/일)": number | '', 적정여부: string | '', } \ No newline at end of file