diff --git a/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx b/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx index 30b97c945..42512f802 100644 --- a/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx +++ b/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx @@ -25,6 +25,8 @@ const tabList = [ { value: 'tab_term_rain', label: '강우시' } ]; +const commentArray = "[미처리하수 추정량 산식 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD)]"; + export default function FlowRateModal(props: { fcltyName: string; facilityCd: string; searchYear: string }) { // 그리드 관련 const { Common, FlowRateModal, searchFlowRateModalList } = useFoStore((state) => state); @@ -192,12 +194,13 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st "연계처리량(m³/일)": CommaToNumber(item.sumFlow), "총인반류수량(m³/일)": CommaToNumber(item.returnAmnt), "방류량(m³/일)": CommaToNumber(item.efflAmnt), - /* "강우량(mm/일)": item.infoRnDay, */ + "미처리하수 추정량(m³/일)": CommaToNumber(item.noProcessInflAmnt), + "강우량(mm/일)": CommaToNumber(item.infoRnDay), }); }); } if (excelDownList && excelDownList.length > 0) { - downloadExcel({ data: JSON.parse(JSON.stringify(excelDownList)), fileName: props.searchYear+'년 '+props.fcltyName + ' 유량현황', sheetNameArray: [props.fcltyName + ' 유량현황'], headerRange: 'A1:G1' }); + downloadExcel({ data: JSON.parse(JSON.stringify(excelDownList)), fileName: props.searchYear+'년 '+props.fcltyName + ' 유량현황', sheetNameArray: [props.fcltyName + ' 유량현황'], headerRange: 'A1:H1' }); } else if (prevExcelListRef.current && prevExcelListRef.current.length > 0) { alert('다운받을 데이터가 없습니다.'); } @@ -233,6 +236,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st boldArray={[0,1,2]} /> +
+ +
@@ -257,6 +263,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st boldArray={[0,1,2]} /> +
+ +
@@ -281,6 +290,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st boldArray={[0,1,2]} /> +
+ +
@@ -305,6 +317,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st boldArray={[0,1,2]} /> +
+ +
@@ -319,7 +334,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
{}} className="h-[370px]" boldArray={[0,1,2]}/>
- +
+ +
diff --git a/apps/fo/app/pages/(with-layout)/rdi/page.tsx b/apps/fo/app/pages/(with-layout)/rdi/page.tsx index c2109ad6a..72373f60f 100644 --- a/apps/fo/app/pages/(with-layout)/rdi/page.tsx +++ b/apps/fo/app/pages/(with-layout)/rdi/page.tsx @@ -14,6 +14,7 @@ import LoadingOverlay from "@common/business_components/ui/loadingBar"; import UnderComment from "@/app/components/common/UnderComment"; const commentArray = [ + "적정판단근거 = 하절기(6~8)월 강우일 중 BOD수질이 최저인 일자의 RDII추정량을 기준으로 판단", "강우시 총 추정유입량 = 청천시 유입하수량 + RDII 추정값", "주) 처리장 유입부에서 측정된 유량 및 수질조사 자료를 기준으로 산정된 결과임" ] @@ -202,7 +203,7 @@ export default function Rdi() { queryClick={chkVal} excelClick={excelDownload} initClick={resetVal} - ref={ref} isAdmin={false} /> + ref={ref} isAdmin={false} />
diff --git a/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx b/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx index 442c9467f..8ac105698 100644 --- a/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx +++ b/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx @@ -15,6 +15,12 @@ import { useCallback, useEffect, useRef, useState } from "react"; import UnderWaterInputModal from "./modal/page"; import type { UnderWaterProps } from "@/app/store/underWaterInput/types"; import LoadingOverlay from "@common/business_components/ui/loadingBar"; +import UnderComment from "@/app/components/common/UnderComment"; + +const commentArray = [ + "적정여부(=연간 지하수유입량/연평균 유입하수량*100)가 20%이하면 “적정”으로 표출, 그 이상은 “초과유입”으로 표출", + "지하수 유입량 = 하수처리장 청천시 실제유입량 - (물사용량 × 오수전환율)" +] export default function UnderWaterInput() { const {Common @@ -238,9 +244,8 @@ export default function UnderWaterInput() {
index !== undefined && cellClick(index)} headName={"지하수유입량 추정"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} widthFixed={true}/>
+
- ※적정여부 = 연간 지하수유입량/연평균 유입하수량*100

- ※지하수 유입량 = 하수처리장 청천시 실제유입량 - (물사용량 × 오수전환율) {selectedRow !== null && ( diff --git a/apps/fo/app/store/flowRate/index.tsx b/apps/fo/app/store/flowRate/index.tsx index 05a41e556..ff406f7d4 100644 --- a/apps/fo/app/store/flowRate/index.tsx +++ b/apps/fo/app/store/flowRate/index.tsx @@ -59,7 +59,8 @@ export type modalExcelType = { "연계처리량(m³/일)": number | '', "총인반류수량(m³/일)": number | '', "방류량(m³/일)": number | '', - /* "강우량(mm/일)": number | string | '', */ + "미처리하수 추정량(m³/일)": number | '', + "강우량(mm/일)": number | string | '', } /** * (2) 모달 @@ -159,7 +160,7 @@ const upHeadListFlowRateModal:TableUpperProps[] = [ { id: "sumFlow", title: "연계처리량(m³/일)", align:"right"}, { id: "returnAmnt", title: "총인 반류수량(m³/일)", align:"right"}, { id: "efflAmnt", title: "방류량(m³/일)", align:"right"}, - { id: "noProcessInflAmnt", title: "미처리하수량(m³/일)", align:"right"}, + { id: "noProcessInflAmnt", title: "미처리하수 추정량(m³/일)", align:"right"}, { id: "infoRnDay", title: "강우량(mm/일)", align:"right"} ] diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx index 6b4eead42..fe1bd06de 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx @@ -1,12 +1,9 @@ "use client"; import { useWrStore } from "@/app/store"; -import { commonCd, rainPageSize } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn"; +import { rainPageSize } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn"; import { rswtPageSize } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn"; -import { - excelDownload, - yearOptions -} from "@/components/lib/func/commom"; +import { excelDownload, yearOptions } from "@/components/lib/func/commom"; import ChkgdModal from "@/components/ui/modal/chkgd/chkgdModal/chkgdModal"; import RainChkgdTable from "@/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable"; import RswtChkgdTable from "@/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable"; @@ -18,7 +15,7 @@ import { SearchInput, SelectBox, Title, - UiModal + UiModal, } from "@common/business_components/ui"; import ListDiv from "@common/business_components/ui/list_div"; import { Button, Label } from "@common/components/ui"; @@ -28,6 +25,7 @@ import { useTranslation } from "react-i18next"; export default function Page() { const { + auth, rainChkSttn, rswtChkSttn, rainChkSttnInit, @@ -41,6 +39,7 @@ export default function Page() { return state; }); + const { laeSeCd } = auth; const [selFcltDiv, setSelFcltDiv] = useState("RNB"); const [rainPageNation, setRainPageNation] = useState(1); const [rswtPageNation, setRswtPageNation] = useState(1); @@ -49,7 +48,9 @@ export default function Page() { open: false, data: {}, }); - const [searchYear, setSearchYear] = useState(String(new Date().getFullYear())); + const [searchYear, setSearchYear] = useState( + String(new Date().getFullYear()) + ); const cellClick = () => { if (searchYear) { if (selFcltDiv === "RNB") { @@ -58,11 +59,11 @@ export default function Page() { rainPageNation, rainPageSize, searchYear, - commonCd, + laeSeCd, fcltNm ); } else { - rainChkSttnInit(rainPageNation, rainPageSize, searchYear, commonCd); + rainChkSttnInit(rainPageNation, rainPageSize, searchYear, laeSeCd); } } else { if (fcltNm) { @@ -70,11 +71,11 @@ export default function Page() { rswtPageNation, rswtPageSize, searchYear, - commonCd, + laeSeCd, fcltNm ); } else { - rswtChkSttnInit(rswtPageNation, rswtPageSize, searchYear, commonCd); + rswtChkSttnInit(rswtPageNation, rswtPageSize, searchYear, laeSeCd); } } } @@ -84,15 +85,9 @@ export default function Page() { if (pageNo > 0) { setRainPageNation(pageNo); if (fcltNm) { - rainChkSttnNmSearch( - pageNo, - rainPageSize, - searchYear, - commonCd, - fcltNm - ); + rainChkSttnNmSearch(pageNo, rainPageSize, searchYear, laeSeCd, fcltNm); } else { - rainChkSttnInit(pageNo, rainPageSize, searchYear, commonCd); + rainChkSttnInit(pageNo, rainPageSize, searchYear, laeSeCd); } } }; @@ -101,38 +96,38 @@ export default function Page() { if (pageNo > 0) { setRswtPageNation(pageNo); if (fcltNm) { - rswtChkNmSttnSearch( - pageNo, - rainPageSize, - searchYear, - commonCd, - fcltNm - ); + rswtChkNmSttnSearch(pageNo, rainPageSize, searchYear, laeSeCd, fcltNm); } else { - rswtChkSttnInit(pageNo, rswtPageSize, searchYear, commonCd); + rswtChkSttnInit(pageNo, rswtPageSize, searchYear, laeSeCd); } } }; useEffect(() => { if (!rainChkSttn.isInit) { - isRainSttn(true) - rainChkSttnInit(1, rainPageSize, new Date().getFullYear().toString(), commonCd); + isRainSttn(true); + rainChkSttnInit( + 1, + rainPageSize, + new Date().getFullYear().toString(), + laeSeCd + ); setIsModal({ data: {}, open: false }); - } - }, [rainChkSttn.isInit, rainChkSttnInit, rainPageSize]); useEffect(() => { if (!rswtChkSttn.isInit) { setIsModal({ data: {}, open: false }); - rswtChkSttnInit(1, rswtPageSize, new Date().getFullYear().toString(), commonCd); - isRswtSttn(true) + rswtChkSttnInit( + 1, + rswtPageSize, + new Date().getFullYear().toString(), + laeSeCd + ); + isRswtSttn(true); } - }, [rswtChkSttn.isInit, rswtChkSttnInit, rswtPageSize]) - - + }, [rswtChkSttn.isInit, rswtChkSttnInit, rswtPageSize]); const handleClick = useCallback( (data: any) => { @@ -140,11 +135,14 @@ export default function Page() { }, [isModal] ); - const { t } = useTranslation('base'); + const { t } = useTranslation("base"); const excelDown = () => { if (rainChkSttn.sttnExcelList && selFcltDiv === "RNB") { - if (!rainChkSttn.sttnExcelList || rainChkSttn.sttnExcelList.length === 0) { - toast.error(t('excelDownErrMsg')); + if ( + !rainChkSttn.sttnExcelList || + rainChkSttn.sttnExcelList.length === 0 + ) { + toast.error(t("excelDownErrMsg")); return; } excelDownload( @@ -155,8 +153,11 @@ export default function Page() { 3 ); } else if (rswtChkSttn.sttnExcelList && selFcltDiv === "RST") { - if (!rswtChkSttn.sttnExcelList || rswtChkSttn.sttnExcelList.length === 0) { - toast.error(t('excelDownErrMsg')); + if ( + !rswtChkSttn.sttnExcelList || + rswtChkSttn.sttnExcelList.length === 0 + ) { + toast.error(t("excelDownErrMsg")); return; } excelDownload( @@ -167,7 +168,7 @@ export default function Page() { 3 ); } - } + }; return ( @@ -177,7 +178,9 @@ export default function Page() {
- +
- + { if (val === "RST") rswtChkPolInit(); - setSelFcltDiv(String(val)) - } - } + setSelFcltDiv(String(val)); + }} value={selFcltDiv ?? rainChkSttn.fcltDiv[0]?.val} />
@@ -227,7 +231,13 @@ export default function Page() { > 조회 - @@ -241,8 +251,8 @@ export default function Page() { {selFcltDiv === "RNB" ? ( { }} - detailUp={() => { }} + deleteData={() => {}} + detailUp={() => {}} handleClick={handleClick} rainChkData={rainChkSttn.rainChkRes} pageNation={rainPageNation} @@ -252,8 +262,8 @@ export default function Page() { /> ) : ( { }} - deleteRswtData={() => { }} + detaiRswtlUpdate={() => {}} + deleteRswtData={() => {}} handleRswtClick={handleClick} rswtChkData={rswtChkSttn.rswtChkRes} pageNation={rswtPageNation} @@ -271,7 +281,14 @@ export default function Page() { setIsModal({ open: !open, data: {} }); }} bodyClass={"w-[80vw] max-w-none"} - body={ { }} />} + body={ + {}} + /> + } > diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx index 1a0af3fad..9c36c4b57 100644 --- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx +++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx @@ -25,7 +25,6 @@ import { } from "./headList"; export const rainPageSize = 5; -export const commonCd = "41"; export type rainChkZodType = z.infer; const fcltDiv = [ @@ -75,7 +74,7 @@ type rainChkgdnActions = { sggCode: SelectDataType[], sggCd:string ): Promise; - rainChkExcelDataUPload(excelData: rainChkZodType[] ,year :string) : Promise; + rainChkExcelDataUPload(excelData: rainChkZodType[] ,year :string,laeSeCd:string) : Promise; rainChkDelete(chkgdnSns: number[] ,year :string): Promise; rainChkHeadChange: (rainChkgdn: rainChkgdnState, isEdit: boolean) => void; rainChkNmSearch: ( @@ -168,7 +167,7 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = ( }, })); }, - rainChkExcelDataUPload: async (excelData: rainChkZodType[] ,year:string) => { + rainChkExcelDataUPload: async (excelData: rainChkZodType[] ,year:string,laeSeCd:string) => { set((state: rainChkgdnType) => ( { rainChkgdn: { ...state.rainChkgdn, isLoading: true } })); try { @@ -178,7 +177,7 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = ( 1, rainPageSize, year, - commonCd + laeSeCd ); set((state: rainChkgdnState) => ({ ...state, diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx index e9ebdab8d..cf2eca339 100644 --- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx +++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx @@ -78,7 +78,7 @@ type rswtChkgdnActions = { sggCode: SelectDataType[], sggCd: string, ): Promise; - rswtChkExceDataUpload: (excelData: rswtChkZodType[]) => void; + rswtChkExceDataUpload: (excelData: rswtChkZodType[],laeSeCd:string) => void; rswtChkDelete: (chkgdnSns: number[] ,year:string) => void; rswtChkDetilsUpdate: (rswtChkDetails: rswtrChkDetailsZodType[] ,year:string) => void; rswtChkPolAndGuide: (chkgdnSn: number) => void; @@ -244,7 +244,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = ( console.log(error); } }, - rswtChkExceDataUpload: async (excelData: rswtChkZodType[]) => { + rswtChkExceDataUpload: async (excelData: rswtChkZodType[],laeSeCd:string) => { try { set((state: rswtChkgdnType) => ( { rswtChkgdn: { ...state.rswtChkgdn, isLoading: true } })); @@ -256,7 +256,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = ( }); } const currentYear = new Date().getFullYear().toString(); - const rswtChkRes = await initFetch(1, rswtPageSize, currentYear, "0"); + const rswtChkRes = await initFetch(1, rswtPageSize, currentYear, laeSeCd); return set((state: rswtChkgdnState) => ({ ...state, rswtChkgdn: { diff --git a/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx b/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx index 24a983dce..4b84491a2 100644 --- a/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx +++ b/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx @@ -36,6 +36,7 @@ export default function ChkgdExcel({ setYearChange: (year: string) => void; }) { const { + auth, rswtChkgdn, rainChkgdn, rainChkExcelDataUPload, @@ -51,6 +52,7 @@ export default function ChkgdExcel({ const [file, setFile] = useState(null); + const { laeSeCd } = auth; const clearFile = () => { if (fileInputRef.current) { fileInputRef.current.value = ""; // ✅ 파일 선택 비우기 @@ -202,7 +204,8 @@ export default function ChkgdExcel({ } else { rainChkExcelDataUPload( excelData as rainChkZodType[], - form.getValues("chckYr") + form.getValues("chckYr"), + laeSeCd ); setIsRegExcel(false); setYearChange(form.getValues("chckYr")); @@ -213,7 +216,7 @@ export default function ChkgdExcel({ return; } else { - rswtChkExceDataUpload(excelRswtData as rswtChkZodType[]); + rswtChkExceDataUpload(excelRswtData as rswtChkZodType[], laeSeCd); setIsRegExcel(false); setYearChange(form.getValues("chckYr")); }