-
+
{}} className="h-[370px]" boldArray={[0,1,2]}/>
-
+
+
+ ☞ 강우량 3mm 이상만 날과 강우영향일(강우일+2일)의 날
diff --git a/apps/fo/app/pages/flowRate/page.tsx b/apps/fo/app/pages/flowRate/page.tsx
index 3910944cf..8e258b5a2 100644
--- a/apps/fo/app/pages/flowRate/page.tsx
+++ b/apps/fo/app/pages/flowRate/page.tsx
@@ -49,7 +49,8 @@ export default function ProcessFacilitySearch() {
const [fcltCpct, setFcltCpct] = useState
("0");
const [fcltyName, setFcltyName] = useState("");
const [operationValue, setOperationValue] = useState("0");
- const [searchYearValue, setSearchYearValue] = useState(selectSearchYear[0]?.val || "0");
+ //const [searchYearValue, setSearchYearValue] = useState(selectSearchYear[0]?.val || "0");
+ const [searchYearValue, setSearchYearValue] = useState("2023");
const [widthSize, setWidthSize] = useState("w-[120%]");
const [upheadList, setUpheadList] = useState(upHeadList1);
const [resetPage, setResetPage] = useState(false);
@@ -197,7 +198,7 @@ export default function ProcessFacilitySearch() {
{selectedRow !== null && (
}
- bodyClass="sm:max-w-[90vw] w-[1050px] h-[700px]"
+ bodyClass="sm:max-w-[90vw] w-[1250px] h-[780px]"
open={selectedRow !== null}
onOpenChange={(open: boolean) => !open && closeModal()}
/>
diff --git a/apps/fo/app/pages/planSewage/page.tsx b/apps/fo/app/pages/planSewage/page.tsx
index 8d7de5d80..c9324c246 100644
--- a/apps/fo/app/pages/planSewage/page.tsx
+++ b/apps/fo/app/pages/planSewage/page.tsx
@@ -70,7 +70,8 @@ export default function PlanSewage() {
// 시설상태
const [operationValue, setOperationValue] = useState("0");
// 조회기간
- const [searchYear, setSearchYear] = useState(selectSearchYear[0]?.val || "0");
+ //const [searchYear, setSearchYear] = useState(selectSearchYear[0]?.val || "0");
+ const [searchYear, setSearchYear] = useState("2023");
/**
* 페이지 함수
@@ -190,6 +191,11 @@ export default function PlanSewage() {
+
+ ☞ 여유용량 = 하수처리시설 시설용량 – 건기시 유입유량(평균)
+ ☞ 변동부하율 = 건기시 일최대 유량/일평균유량(기준 최근 3개년)
+ ☞ 분류식화율 = 분류식지역 면적(㎢) / 처리구역 면적합계(㎢) ×100
+
diff --git a/apps/fo/app/pages/sewageOccur/modal/page.tsx b/apps/fo/app/pages/sewageOccur/modal/page.tsx
index e8a90651e..824871432 100644
--- a/apps/fo/app/pages/sewageOccur/modal/page.tsx
+++ b/apps/fo/app/pages/sewageOccur/modal/page.tsx
@@ -8,7 +8,7 @@ import { useEffect, useState } from "react";
export default function SewageOccurModal(props: { fcltyName: string; facilityCd : string; searchYear : string}) {
// 그리드 관련
- const {SewageOccurDetail} = useFoStore((state) => state);
+ const {SewageOccurDetail, searchSewageOccurDetailList} = useFoStore((state) => state);
// searchYear 유효성 검사 및 기본값 설정
const validSearchYear = props.searchYear && /^\d{4}$/.test(props.searchYear) ? props.searchYear : new Date().getFullYear().toString();
@@ -22,8 +22,8 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd
} = SewageOccurDetail;
useEffect(() => {
- setDetailList(gridListSewageOccurDetail);
- }, [gridListSewageOccurDetail]);
+ searchSewageOccurDetailList(props.facilityCd, validSearchYear);
+ }, [searchSewageOccurDetailList, props.facilityCd, validSearchYear]);
useEffect(() => {
const filteredList = gridListSewageOccurDetail.filter(item => item.msrDt.replace(/-/g, '') >= startYearMonth && item.msrDt.replace(/-/g, '') <= endYearMonth);
@@ -70,6 +70,9 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd
});
avgWaterUsage = totalWaterUsage?totalWaterUsage / filteredList.length:0;
+ console.log("totalWaterUsage", totalWaterUsage);
+ console.log("filteredList.length", filteredList.length);
+ console.log("avgWaterUsage", avgWaterUsage);
avgSwageChangePercent = totalSwageChangePercent?totalSwageChangePercent / filteredList.length:0;
avgEstimationSewage = totalEstimationSewage?totalEstimationSewage / filteredList.length:0;
diff --git a/apps/fo/app/pages/sewageOccur/page.tsx b/apps/fo/app/pages/sewageOccur/page.tsx
index a137d9ebe..af59c633e 100644
--- a/apps/fo/app/pages/sewageOccur/page.tsx
+++ b/apps/fo/app/pages/sewageOccur/page.tsx
@@ -13,12 +13,14 @@ export default function PlanSewage() {
,SewageOccurSearch
,initializeCommonData
,searchSewageOccurList
+ ,calculateModalDataForAllFacilities
} = useFoStore((state) => state) || {
Common: { isInit: false, selectUpdownData: [], selectOperationData: [], selectSidoData: [], selectSigunData: [], selectRegionData: [], selectUnitWaterShedData: [], selectMiddleRegionData: [], selectEnvPartData: [], selectSearchYear: [{ val: "0" }], btnClass: "" },
SewageOccur: { sewageOccurList: [], sewageOccurCount: 0, excelList: [], upHeadList1: [], upHeadList2: [], upHeadList3: [] },
SewageOccurSearch: { labelArray: [] },
initializeCommonData: () => {},
- searchSewageOccurList: () => {}
+ searchSewageOccurList: () => {},
+ calculateModalDataForAllFacilities: async () => []
};
const {
@@ -66,6 +68,7 @@ export default function PlanSewage() {
const [selectedRow, setSelectedRow] = useState