From 8e43ca281fde5a3b08fda36d0ecc2645870125b5 Mon Sep 17 00:00:00 2001 From: jsyang Date: Mon, 18 Aug 2025 18:14:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=90=EB=A6=BF=EC=88=98=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/store/facilityPrecipitation/index.tsx | 30 ++++---- apps/fo/app/store/processArea/index.tsx | 74 +++++++++---------- apps/fo/app/store/processFacility/index.tsx | 8 +- apps/fo/app/store/rdi/index.tsx | 29 ++++---- apps/fo/app/store/underWaterInput/index.tsx | 6 +- 5 files changed, 76 insertions(+), 71 deletions(-) diff --git a/apps/fo/app/store/facilityPrecipitation/index.tsx b/apps/fo/app/store/facilityPrecipitation/index.tsx index cfb18b91a..66727122d 100644 --- a/apps/fo/app/store/facilityPrecipitation/index.tsx +++ b/apps/fo/app/store/facilityPrecipitation/index.tsx @@ -73,11 +73,11 @@ const upHeadList1:TableUpperProps[] = [ { id: "gugun", title: "시군구", upName:"upChangeRe",upSequnce:2, row: 1 }, { id: "bscFctNm", title: "시설명", row: 0, rowSpan: 2}, { id: "addr", title: "주소", row: 0, rowSpan: 2}, - { id: "fctCpc", title: "시설용량(m³/일)", row: 0, rowSpan: 2}, + { id: "fctCpc", title: "시설용량(m³/일)", row: 0, rowSpan: 2, align:"right"}, { id: "stnKo", title: "관측소 정보", row: 0, rowSpan: 2}, - { id: "infoRnDay", title: "강우일\n(일)", row: 0, rowSpan: 2}, - { id: "rainEffectDay", title: "강우영향일\n(일)", row: 0, rowSpan: 2}, - { id: "totalYearRain", title: "연간 총 총강수량\n(mm)", row: 0, rowSpan: 2} + { id: "infoRnDay", title: "강우일\n(일)", row: 0, rowSpan: 2, align:"right"}, + { id: "rainEffectDay", title: "강우영향일\n(일)", row: 0, rowSpan: 2, align:"right"}, + { id: "totalYearRain", title: "연간 총 총강수량\n(mm)", row: 0, rowSpan: 2, align:"right"} ]; const upHeadList2:TableUpperProps[] = [ @@ -87,11 +87,11 @@ const upHeadList2:TableUpperProps[] = [ { id: "mdmbsn", title: "중권역", upName:"upChangeRe", upSequnce:3, row: 1}, { id: "bscFctNm", title: "시설명", row: 0, rowSpan: 2}, { id: "addr", title: "주소", row: 0, rowSpan: 2}, - { id: "fctCpc", title: "시설용량(m³/일)", row: 0, rowSpan: 2}, + { id: "fctCpc", title: "시설용량(m³/일)", row: 0, rowSpan: 2, align:"right"}, { id: "stnKo", title: "관측소 정보", row: 0, rowSpan: 2}, - { id: "infoRnDay", title: "강우일\n(일)", row: 0, rowSpan: 2}, - { id: "rainEffectDay", title: "강우영향일\n(일)", row: 0, rowSpan: 2}, - { id: "totalYearRain", title: "연간 총 총강수량\n(mm)", row: 0, rowSpan: 2} + { id: "infoRnDay", title: "강우일\n(일)", row: 0, rowSpan: 2, align:"right"}, + { id: "rainEffectDay", title: "강우영향일\n(일)", row: 0, rowSpan: 2, align:"right"}, + { id: "totalYearRain", title: "연간 총 총강수량\n(mm)", row: 0, rowSpan: 2, align:"right"} ]; const upHeadList3:TableUpperProps[] = [ @@ -105,11 +105,11 @@ const upHeadList3:TableUpperProps[] = [ { id: "gugun", title: "시군구", upName:"upChangeRe2",upSequnce:2, row: 1}, { id: "bscFctNm", title: "시설명", row: 0, rowSpan: 2}, { id: "addr", title: "주소", row: 0, rowSpan: 2}, - { id: "fctCpc", title: "시설용량(m³/일)", row: 0, rowSpan: 2}, + { id: "fctCpc", title: "시설용량(m³/일)", row: 0, rowSpan: 2, align:"right"}, { id: "stnKo", title: "관측소 정보", row: 0, rowSpan: 2}, - { id: "infoRnDay", title: "강우일\n(일)", row: 0, rowSpan: 2}, - { id: "rainEffectDay", title: "강우영향일\n(일)", row: 0, rowSpan: 2}, - { id: "totalYearRain", title: "연간 총 총강수량\n(mm)", row: 0, rowSpan: 2} + { id: "infoRnDay", title: "강우일\n(일)", row: 0, rowSpan: 2, align:"right"}, + { id: "rainEffectDay", title: "강우영향일\n(일)", row: 0, rowSpan: 2, align:"right"}, + { id: "totalYearRain", title: "연간 총 총강수량\n(mm)", row: 0, rowSpan: 2, align:"right"} ]; const facilityPrecipitation:FacilityPrecipitationProps[] = [ @@ -121,9 +121,9 @@ const facilityPrecipitation:FacilityPrecipitationProps[] = [ // 강수현황 (헤더) const upHeadListPrecipitationDetail:TableUpperProps[] = [ { id: "rainDt", title: "날짜"}, - { id: "infoRnDay", title: "강수량(mm/일)"}, - { id: "rainDay", title: "강우일(일)"}, - { id: "rainEffectDay", title: "강우영향일(일)"} + { id: "infoRnDay", title: "강수량(mm/일)", align:"right"}, + { id: "rainDay", title: "강우일(일)", align:"right"}, + { id: "rainEffectDay", title: "강우영향일(일)", align:"right"} ] // 강수현황 (리스트) const gridListPrecipitationDetail:PrecipitationPropsDetailProps[] = [ diff --git a/apps/fo/app/store/processArea/index.tsx b/apps/fo/app/store/processArea/index.tsx index d051758f0..dc3826fef 100644 --- a/apps/fo/app/store/processArea/index.tsx +++ b/apps/fo/app/store/processArea/index.tsx @@ -136,26 +136,26 @@ const upHeadList1:TableUpperProps[] = [ { id: "fctCpc", title: "시설용량(m³/일)", align:"right", rowSpan:3, row:0}, { id: "B", title: "시설계획", colSpan:19, row:0}, { id: "C", title: "증설계획(m³/일)", colSpan:6, row:1}, - { id: "planSwageQntSumDt4", title: "기승인\n4단계", row:2}, - { id: "planSwageQntSum", title: "현재", row:2}, - { id: "planSwageQntSumDc1", title: "1단계", row:2}, - { id: "planSwageQntSumDc2", title: "2단계", row:2}, - { id: "planSwageQntSumDc3", title: "3단계", row:2}, - { id: "planSwageQntSumDc4", title: "4단계", row:2}, + { id: "planSwageQntSumDt4", title: "기승인\n4단계", row:2, align:"right"}, + { id: "planSwageQntSum", title: "현재", row:2, align:"right"}, + { id: "planSwageQntSumDc1", title: "1단계", row:2, align:"right"}, + { id: "planSwageQntSumDc2", title: "2단계", row:2, align:"right"}, + { id: "planSwageQntSumDc3", title: "3단계", row:2, align:"right"}, + { id: "planSwageQntSumDc4", title: "4단계", row:2, align:"right"}, { id: "D", title: "처리인구(인)", colSpan:6, row:1}, - { id: "swtrmtPpltnCntDt4", title: "기승인\n4단계", row:2}, - { id: "swtrmtPpltnCnt", title: "현재", row:2}, - { id: "swtrmtPpltnCntDc1", title: "1단계", row:2}, - { id: "swtrmtPpltnCntDc2", title: "2단계", row:2}, - { id: "swtrmtPpltnCntDc3", title: "3단계", row:2}, - { id: "swtrmtPpltnCntDc4", title: "4단계", row:2}, + { id: "swtrmtPpltnCntDt4", title: "기승인\n4단계", row:2, align:"right"}, + { id: "swtrmtPpltnCnt", title: "현재", row:2, align:"right"}, + { id: "swtrmtPpltnCntDc1", title: "1단계", row:2, align:"right"}, + { id: "swtrmtPpltnCntDc2", title: "2단계", row:2, align:"right"}, + { id: "swtrmtPpltnCntDc3", title: "3단계", row:2, align:"right"}, + { id: "swtrmtPpltnCntDc4", title: "4단계", row:2, align:"right"}, { id: "E", title: "처리구역(km²)", colSpan:7, row:1}, - { id: "swtrmtZoneAreaDt4", title: "기승인\n4단계", row:2}, - { id: "swtrmtZoneArea", title: "현재", row:2}, - { id: "swtrmtZoneAreaDc1", title: "1단계", row:2}, - { id: "swtrmtZoneAreaDc2", title: "2단계", row:2}, - { id: "swtrmtZoneAreaDc3", title: "3단계", row:2}, - { id: "swtrmtZoneAreaDc4", title: "4단계", row:2}, + { id: "swtrmtZoneAreaDt4", title: "기승인\n4단계", row:2, align:"right"}, + { id: "swtrmtZoneArea", title: "현재", row:2, align:"right"}, + { id: "swtrmtZoneAreaDc1", title: "1단계", row:2, align:"right"}, + { id: "swtrmtZoneAreaDc2", title: "2단계", row:2, align:"right"}, + { id: "swtrmtZoneAreaDc3", title: "3단계", row:2, align:"right"}, + { id: "swtrmtZoneAreaDc4", title: "4단계", row:2, align:"right"}, { id: "trtDstr", title: "처리구역", row:2} ]; @@ -167,13 +167,13 @@ const processAreaList:ProcessAreaProps[] = [ */ // 시설증설 계획 (헤더) const upHeadListFcltyImproveInfo:TableUpperProps[] = [ - { id: "planSwageQntSumDt4", title: "기승인\n4단계(m³/일)", rowSpan:2, row:0}, + { id: "planSwageQntSumDt4", title: "기승인\n4단계(m³/일)", rowSpan:2, row:0, align:"right"}, { id: "A", title: "증설계획(m³/일)", colSpan:5, row:0}, - { id: "planSwageQntSum", title: "현재", row:1}, - { id: "planSwageQntSumDc1", title: "1단계", row:1}, - { id: "planSwageQntSumDc2", title: "2단계", row:1}, - { id: "planSwageQntSumDc3", title: "3단계", row:1}, - { id: "planSwageQntSumDc4", title: "4단계", row:1}, + { id: "planSwageQntSum", title: "현재", row:1, align:"right"}, + { id: "planSwageQntSumDc1", title: "1단계", row:1, align:"right"}, + { id: "planSwageQntSumDc2", title: "2단계", row:1, align:"right"}, + { id: "planSwageQntSumDc3", title: "3단계", row:1, align:"right"}, + { id: "planSwageQntSumDc4", title: "4단계", row:1, align:"right"}, ]; // 시설증설 계획 (리스트) @@ -182,13 +182,13 @@ const gridListFcltyImproveInfo:FcltyImproveInfoProps[] = [ // 처리인구 계획 (헤더) const upHeadListProcessPopulation:TableUpperProps[] = [ - { id: "swtrmtPpltnCntDt4", title: "기승인\n4단계(인)", rowSpan:2, row:0}, + { id: "swtrmtPpltnCntDt4", title: "기승인\n4단계(인)", rowSpan:2, row:0, align:"right"}, { id: "A", title: "처리인구(인)", colSpan:5, row:0}, - { id: "swtrmtPpltnCnt", title: "현재", row:1}, - { id: "swtrmtPpltnCntDc1", title: "1단계", row:1}, - { id: "swtrmtPpltnCntDc2", title: "2단계", row:1}, - { id: "swtrmtPpltnCntDc3", title: "3단계", row:1}, - { id: "swtrmtPpltnCntDc4", title: "4단계", row:1}, + { id: "swtrmtPpltnCnt", title: "현재", row:1, align:"right"}, + { id: "swtrmtPpltnCntDc1", title: "1단계", row:1, align:"right"}, + { id: "swtrmtPpltnCntDc2", title: "2단계", row:1, align:"right"}, + { id: "swtrmtPpltnCntDc3", title: "3단계", row:1, align:"right"}, + { id: "swtrmtPpltnCntDc4", title: "4단계", row:1, align:"right"}, ]; // 처리인구 계획 (리스트) @@ -197,13 +197,13 @@ const gridListProcessPopulation:ProcessPopulationProps[] = [ // 처리구역 계획 (헤더) const upHeadListProcessAreaPlan:TableUpperProps[] = [ - { id: "swtrmtZoneAreaDt4", title: "기승인\n4단계(km²)", rowSpan:2, row:0}, - { id: "A", title: "처리면적(km²)", colSpan:6, row:0}, - { id: "swtrmtZoneArea", title: "현재", row:1}, - { id: "swtrmtZoneAreaDc1", title: "1단계", row:1}, - { id: "swtrmtZoneAreaDc2", title: "2단계", row:1}, - { id: "swtrmtZoneAreaDc3", title: "3단계", row:1}, - { id: "swtrmtZoneAreaDc4", title: "4단계", row:1}, + { id: "swtrmtZoneAreaDt4", title: "기승인\n4단계(km²)", rowSpan:2, row:0, align:"right"}, + { id: "A", title: "처리면적(km²)", colSpan:6, row:0, align:"right"}, + { id: "swtrmtZoneArea", title: "현재", row:1, align:"right"}, + { id: "swtrmtZoneAreaDc1", title: "1단계", row:1, align:"right"}, + { id: "swtrmtZoneAreaDc2", title: "2단계", row:1, align:"right"}, + { id: "swtrmtZoneAreaDc3", title: "3단계", row:1, align:"right"}, + { id: "swtrmtZoneAreaDc4", title: "4단계", row:1, align:"right"}, { id: "trtDstr", title: "처리구역", row:1} ]; diff --git a/apps/fo/app/store/processFacility/index.tsx b/apps/fo/app/store/processFacility/index.tsx index 1b3130275..674093371 100644 --- a/apps/fo/app/store/processFacility/index.tsx +++ b/apps/fo/app/store/processFacility/index.tsx @@ -117,7 +117,8 @@ export type fcltyHistInfoProps = { rnDt : string, sitArea : number, trtDstrArea : number, - swrTrtPopl : number + swrTrtPopl : number, + fcltCpc : number | '' } // 시설 수질정보 @@ -327,6 +328,7 @@ const upHeadListFcltyHistInfo:TableUpperProps[] = [ { id: "cmplDt", title: "준공일"}, { id: "trlrnCmplDt", title: "시운전완료일"}, { id: "rnDt", title: "가동개시일"}, + { id: "fctCpc", title: "시설용량(m³/일)", align: 'right' }, ]; // 시설 이력관리 (리스트) @@ -343,6 +345,7 @@ const gridListFcltyHistInfo:fcltyHistInfoProps[] = [ sitArea : 0, trtDstrArea : 0, swrTrtPopl : 0, + fcltCpc : 860000 } ]; @@ -814,7 +817,8 @@ export const processFacilityReducer:(set:SetStateFunction)=>ProcessFacilityActio plInflWqltSs: lastWaterQltyInfo?.plInflWqltSs === 'NULL' || lastWaterQltyInfo?.plInflWqltSs === undefined ? '' : lastWaterQltyInfo.plInflWqltSs, plInflWqltTn: lastWaterQltyInfo?.plInflWqltTn === 'NULL' || lastWaterQltyInfo?.plInflWqltTn === undefined ? '' : lastWaterQltyInfo.plInflWqltTn, plInflWqltTp: lastWaterQltyInfo?.plInflWqltTp === 'NULL' || lastWaterQltyInfo?.plInflWqltTp === undefined ? '' : lastWaterQltyInfo.plInflWqltTp - }] + }], + } })); } else { diff --git a/apps/fo/app/store/rdi/index.tsx b/apps/fo/app/store/rdi/index.tsx index fd19c2c22..2bd616b92 100644 --- a/apps/fo/app/store/rdi/index.tsx +++ b/apps/fo/app/store/rdi/index.tsx @@ -21,7 +21,7 @@ export type RdiProps = { daddr : string, fctCpc : number, summerMinBodValue : number, - inflAmnt : number, + inflAmnt : number | string | '', winterAvgBodLowRainfall : number, rdiiValue : number, infoRnDay : number, @@ -97,11 +97,11 @@ const upHeadList1:TableUpperProps[] = [ { id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row:0, rowSpan:2 }, { id: "B", title: "하절기 운영현황(6~8월)", row:0, colSpan:2 }, { id: "summerMinBodValue", title: "3mm 이상 강우일 중 최저 유입BOD\n(mg/L)", align:"right", row:1 }, - { id: "inflAmnt", title: "하절기최저유입BOD유입유량\n(m³/일)", row:1 }, + { id: "inflAmnt", title: "하절기최저유입BOD유입유량\n(m³/일)", row:1, align:"right" }, { id: "C", title: "동절기 운영현황(1~2월)", row:0 }, - { id: "winterAvgBodLowRainfall", title: "청천시 유입BOD\n(mg/L)", row:1 }, - { id: "rdiiValue", title: "RDII추정", row:0, rowSpan:2 }, - { id: "infoRnDay", title: "RDII추정시일강수량\n(mm)", row:0, rowSpan:2 }, + { id: "winterAvgBodLowRainfall", title: "청천시 유입BOD\n(mg/L)", row:1, align:"right" }, + { id: "rdiiValue", title: "RDII추정", row:0, rowSpan:2, align:"right" }, + { id: "infoRnDay", title: "RDII추정시일강수량\n(mm)", row:0, rowSpan:2, align:"right" }, ]; const upHeadList2:TableUpperProps[] = [ @@ -114,11 +114,11 @@ const upHeadList2:TableUpperProps[] = [ { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 }, { id: "B", title: "하절기 운영현황(6~8월)", row:0, colSpan:2 }, { id: "summerMinBodValue", title: "하절기강우일최저유입BOD", align:"right", row:1 }, - { id: "inflAmnt", title: "하절기최저유입BOD유입유량", row:1 }, + { id: "inflAmnt", title: "하절기최저유입BOD유입유량", row:1, align:"right" }, { id: "D", title: "동절기 운영현황(1~2월)", row:0 }, - { id: "winterAvgBodLowRainfall", title: "동절기청천시유입BOD", row:1 }, - { id: "rdiiValue", title: "RDII추정", row:0, rowSpan:2 }, - { id: "infoRnDay", title: "RDII추정시일강수량", row:0, rowSpan:2 }, + { id: "winterAvgBodLowRainfall", title: "동절기청천시유입BOD", row:1, align:"right" }, + { id: "rdiiValue", title: "RDII추정", row:0, rowSpan:2, align:"right" }, + { id: "infoRnDay", title: "RDII추정시일강수량", row:0, rowSpan:2, align:"right" }, ]; const upHeadList3:TableUpperProps[] = [ @@ -135,11 +135,11 @@ const upHeadList3:TableUpperProps[] = [ { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 }, { id: "C", title: "하절기 운영현황(6~8월)", row:0, colSpan:2 }, { id: "summerMinBodValue", title: "하절기강우일최저유입BOD", align:"right", row:1 }, - { id: "inflAmnt", title: "하절기최저유입BOD유입유량", row:1 }, + { id: "inflAmnt", title: "하절기최저유입BOD유입유량", row:1, align:"right" }, { id: "D", title: "동절기 운영현황(1~2월)", row:0 }, - { id: "winterAvgBodLowRainfall", title: "동절기청천시유입BOD", row:1 }, - { id: "rdiiValue", title: "RDII추정", row:0, rowSpan:2 }, - { id: "infoRnDay", title: "RDII추정시일강수량", row:0, rowSpan:2 }, + { id: "winterAvgBodLowRainfall", title: "동절기청천시유입BOD", row:1, align:"right" }, + { id: "rdiiValue", title: "RDII추정", row:0, rowSpan:2, align:"right" }, + { id: "infoRnDay", title: "RDII추정시일강수량", row:0, rowSpan:2, align:"right" }, ]; const rdiList:RdiProps[] = [ @@ -211,6 +211,7 @@ const dataFormSetting=(item : RdiProps)=> { DataForm({ type: 'float1', column: 'winterAvgBodLowRainfall', item: item as unknown as Record}); DataForm({ type: 'float2', column: 'rdiiValue', item: item as unknown as Record}); DataForm({ type: 'float2', column: 'infoRnDay', item: item as unknown as Record}); + DataForm({ type: 'float1', column: 'inflAmnt', item: item as unknown as Record}); } // Add type definitions for state setter function @@ -238,7 +239,7 @@ export const rdiReducer:(set:SetStateFunction)=>RdiActions=(set: SetStateFunctio ...item, sido: item.lclgvrnmntNm.split(' ')[0]?.toString() || '', sigungo: item.lclgvrnmntNm.split(' ')[1]?.toString() || '', - inflAmnt: item.inflAmnt?item.inflAmnt.toFixed(1) : '' + inflAmnt: item.inflAmnt?item.inflAmnt.toFixed(1): '' } }) diff --git a/apps/fo/app/store/underWaterInput/index.tsx b/apps/fo/app/store/underWaterInput/index.tsx index 986a0afe3..7c2724aa7 100644 --- a/apps/fo/app/store/underWaterInput/index.tsx +++ b/apps/fo/app/store/underWaterInput/index.tsx @@ -79,9 +79,9 @@ const upHeadList3:TableUpperProps[] = [ // 모달 const upHeadListUnderWaterDetail:TableUpperProps[] = [ { id: "msrDt", title: "날짜" }, - { id: "realSewageInput", title: "청천시 실제 하수유입량\n(m³/일)" }, - { id: "sewageOccur", title: "오수발생량\n(m³/일)" }, - { id: "underWaterInput", title: "지하수 유입량\n(m³/일)" }, + { id: "realSewageInput", title: "청천시 실제 하수유입량\n(m³/일)", align:"right" }, + { id: "sewageOccur", title: "오수발생량\n(m³/일)", align:"right" }, + { id: "underWaterInput", title: "지하수 유입량\n(m³/일)", align:"right" }, ]; const underWaterList:UnderWaterProps[] = [