diff --git a/apps/fo/app/components/common/UnderComment.tsx b/apps/fo/app/components/common/UnderComment.tsx
new file mode 100644
index 000000000..898eb861e
--- /dev/null
+++ b/apps/fo/app/components/common/UnderComment.tsx
@@ -0,0 +1,31 @@
+import React from 'react'
+
+/**
+ * 하단 주석 영역
+ */
+
+type CommentType={
+ commentStartPoint? : string,
+ commentArray? : string[],
+ divHeight? : string,
+}
+
+function UnderComment({commentStartPoint="☞", commentArray=[], divHeight="14"} :CommentType) {
+
+ if(commentArray && commentArray.length > 0){
+ return (
+
+ {commentArray.map((item, index) => (
+
+
+ {commentStartPoint} {item}
+
+
+ ))}
+
+ )
+ }
+}
+
+export default UnderComment;
\ No newline at end of file
diff --git a/apps/fo/app/intro.md b/apps/fo/app/intro.md
new file mode 100644
index 000000000..99be4afd7
--- /dev/null
+++ b/apps/fo/app/intro.md
@@ -0,0 +1,137 @@
+# 운영실태 인수인계
+## 이력
+ written by yjs
+ 2025-
+## 0. 알아두면 좋아요
+ - 화면 초기 화면 : 메인 대시보드(표로 보는 대시보드)
+
- {}}
- >
-
+ {}}
+ widthFixed={true}
+ >
+
☞ 일수에 강우영향일 포함됨
)
diff --git a/apps/fo/app/pages/(with-layout)/facilityPrecipitation/modal/page.tsx b/apps/fo/app/pages/(with-layout)/facilityPrecipitation/modal/page.tsx
index bb430d0ba..524cdc99c 100644
--- a/apps/fo/app/pages/(with-layout)/facilityPrecipitation/modal/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/facilityPrecipitation/modal/page.tsx
@@ -105,6 +105,8 @@ export default function PrecipitationModal(props: PrecipitationModalProps) {
const getTableData = () => {
const totals = calculateTotals();
+ totals.infoRnDay = roundNumber(totals.infoRnDay, 1);
+
return [
{
bscFctCd: "",
@@ -220,6 +222,7 @@ export default function PrecipitationModal(props: PrecipitationModalProps) {
cellClick={undefined}
onPageChange={() => {}}
boldArray={[0]}
+ widthFixed={true}
/>
diff --git a/apps/fo/app/pages/(with-layout)/facilityPrecipitation/page.tsx b/apps/fo/app/pages/(with-layout)/facilityPrecipitation/page.tsx
index 0d66de569..aaba872d7 100644
--- a/apps/fo/app/pages/(with-layout)/facilityPrecipitation/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/facilityPrecipitation/page.tsx
@@ -6,6 +6,7 @@ import ListDiv from "@common/business_components/ui/list_div";
import { useCallback, useEffect, useRef, useState } from "react";
import PrecipitationModal from "./modal/page";
import LoadingOverlay from "@common/business_components/ui/loadingBar";
+import UnderComment from "@/app/components/common/UnderComment";
export default function FacilityPrecipitation() {
const {Common
@@ -223,9 +224,9 @@ export default function FacilityPrecipitation() {
- index !== undefined && cellClick(index)} headName={"시설별 강수현황"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} />
+ index !== undefined && cellClick(index)} headName={"시설별 강수현황"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} widthFixed={true} />
-
☞ 강우일은 3mm 이상만 해당 / 강우영향일은 강우일 및 강우일 후 연속 2일간으로 정의
+
diff --git a/apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx
index d7cad3367..eedd52b37 100644
--- a/apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx
@@ -8,6 +8,15 @@ import type { ReturnType } from "../../../../components/common/FacilityTermModal
import FacilityTermModalHeader from "../../../../components/common/FacilityTermModalHeader";
import { HeadMakeColSpan } from "../HeadMakeColSpan";
import { roundNumber } from "@/app/components/common/DataForm";
+import UnderComment from "@/app/components/common/UnderComment";
+
+const commentArrayChungchun = [
+ "청천시 : 강우량이 3mm미만의 날"
+];
+
+const commentArrayRain = [
+ "강우량 3mm 이상만 날과 강우영향일(강우일+2일)의 날"
+];
type ModalProps ={
fcltyName: string;
@@ -40,9 +49,10 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
searchFacilityWaterQltyListHist,
Common
} = useFoStore((state) => state);
- const {btnClass} = Common;
+ const {btnClass, COD_YEAR} = Common;
const {
upHeadListModalYear,
+ upHeadListModalYearCod,
facilityWaterQltyYearList,
upHeadListModalTms,
tmsList,
@@ -65,12 +75,14 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
let maxEfflWqltTn = 0;
let maxEfflWqltTp = 0;
let maxefflWqltToc = 0;
+ let maxefflWqltCod = 0;
let maxEfflWqltSs = 0;
let maxinflAssctBfrWqltBod = 0;
let maxinflAssctBfrWqltTn = 0;
let maxInflAssctBfrWqltTp = 0;
let maxinflAssctBfrWqltToc = 0;
+ let maxinflAssctBfrWqltCod = 0;
let maxinflAssctBfrWqltSs = 0;
let maxTpInflWqltBod = 0;
@@ -84,12 +96,14 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
let minEfflWqltTn = filteredData.length > 0 ? parseNumber(filteredData[0]?.efflWqltTn) : 0;
let minEfflWqltTp = filteredData.length > 0 ? parseNumber(filteredData[0]?.efflWqltTp) : 0;
let minefflWqltToc = filteredData.length > 0 ? parseNumber(filteredData[0]?.efflWqltToc) : 0;
+ let minefflWqltCod = filteredData.length > 0 ? parseNumber(filteredData[0]?.efflWqltCod) : 0;
let minEfflWqltSs = filteredData.length > 0 ? parseNumber(filteredData[0]?.efflWqltSs) : 0;
let mininflAssctBfrWqltBod = filteredData.length > 0 ? parseNumber(filteredData[0]?.inflAssctBfrWqltBod) : 0;
let mininflAssctBfrWqltTn = filteredData.length > 0 ? parseNumber(filteredData[0]?.inflAssctBfrWqltTn) : 0;
let minInflAssctBfrWqltTp = filteredData.length > 0 ? parseNumber(filteredData[0]?.inflAssctBfrWqltTp) : 0;
let mininflAssctBfrWqltToc = filteredData.length > 0 ? parseNumber(filteredData[0]?.inflAssctBfrWqltToc) : 0;
+ let mininflAssctBfrWqltCod = filteredData.length > 0 ? parseNumber(filteredData[0]?.inflAssctBfrWqltCod) : 0;
let mininflAssctBfrWqltSs = filteredData.length > 0 ? parseNumber(filteredData[0]?.inflAssctBfrWqltSs) : 0;
let minTpInflWqltBod = 99999999;
@@ -101,12 +115,14 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
let avgEfflWqltTn = 0;
let avgEfflWqltTp = 0;
let avgefflWqltToc = 0;
+ let avgefflWqltCod = 0;
let avgEfflWqltSs = 0;
let avginflAssctBfrWqltBod = 0;
let avginflAssctBfrWqltTn = 0;
let avgInflAssctBfrWqltTp = 0;
let avginflAssctBfrWqltToc = 0;
+ let avginflAssctBfrWqltCod = 0;
let avginflAssctBfrWqltSs = 0;
let avgTpInflWqltBod = 0;
@@ -123,11 +139,13 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
const efflWqltTn = parseNumber(item.efflWqltTn);
const efflWqltTp = parseNumber(item.efflWqltTp);
const efflWqltToc = parseNumber(item.efflWqltToc);
+ const efflWqltCod = parseNumber(item.efflWqltCod?item.efflWqltCod.replaceAll("(","").replaceAll(")",""):0);
const efflWqltSs = parseNumber(item.efflWqltSs);
const inflAssctBfrWqltBod = parseNumber(item.inflAssctBfrWqltBod);
const inflAssctBfrWqltTn = parseNumber(item.inflAssctBfrWqltTn);
const inflAssctBfrWqltTp = parseNumber(item.inflAssctBfrWqltTp);
const inflAssctBfrWqltToc = parseNumber(item.inflAssctBfrWqltToc);
+ const inflAssctBfrWqltCod = parseNumber(item.inflAssctBfrWqltCod?item.inflAssctBfrWqltCod.replaceAll("(","").replaceAll(")",""):0);
const inflAssctBfrWqltSs = parseNumber(item.inflAssctBfrWqltSs);
const tpInflWqltBod = parseNumber(item.tpInflWqltBod);
@@ -145,12 +163,14 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
maxEfflWqltTn = Math.max(maxEfflWqltTn, efflWqltTn);
maxEfflWqltTp = Math.max(maxEfflWqltTp, efflWqltTp);
maxefflWqltToc = Math.max(maxefflWqltToc, efflWqltToc);
+ maxefflWqltCod = Math.max(maxefflWqltCod, efflWqltCod);
maxEfflWqltSs = Math.max(maxEfflWqltSs, efflWqltSs);
maxinflAssctBfrWqltBod = Math.max(maxinflAssctBfrWqltBod, inflAssctBfrWqltBod);
maxinflAssctBfrWqltTn = Math.max(maxinflAssctBfrWqltTn, inflAssctBfrWqltTn);
maxInflAssctBfrWqltTp = Math.max(maxInflAssctBfrWqltTp, inflAssctBfrWqltTp);
maxinflAssctBfrWqltToc = Math.max(maxinflAssctBfrWqltToc, inflAssctBfrWqltToc);
+ maxinflAssctBfrWqltCod = Math.max(maxinflAssctBfrWqltCod, inflAssctBfrWqltCod);
maxinflAssctBfrWqltSs = Math.max(maxinflAssctBfrWqltSs, inflAssctBfrWqltSs);
maxTpInflWqltBod = Math.max(maxTpInflWqltBod, tpInflWqltBod);
@@ -162,12 +182,14 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
minEfflWqltTn = Math.min(minEfflWqltTn, efflWqltTn);
minEfflWqltTp = Math.min(minEfflWqltTp, efflWqltTp);
minefflWqltToc = Math.min(minefflWqltToc, efflWqltToc);
+ minefflWqltCod = Math.min(minefflWqltCod, efflWqltCod);
minEfflWqltSs = Math.min(minEfflWqltSs, efflWqltSs);
mininflAssctBfrWqltBod = Math.min(mininflAssctBfrWqltBod, inflAssctBfrWqltBod);
mininflAssctBfrWqltTn = Math.min(mininflAssctBfrWqltTn, inflAssctBfrWqltTn);
minInflAssctBfrWqltTp = Math.min(minInflAssctBfrWqltTp, inflAssctBfrWqltTp);
mininflAssctBfrWqltToc = Math.min(mininflAssctBfrWqltToc, inflAssctBfrWqltToc);
+ mininflAssctBfrWqltCod = Math.min(mininflAssctBfrWqltToc, inflAssctBfrWqltCod);
mininflAssctBfrWqltSs = Math.min(mininflAssctBfrWqltSs, inflAssctBfrWqltSs);
if(item.tpInflWqltBod != null && item.tpInflWqltBod.trim() != '' && item.tpInflWqltBod != undefined ){
@@ -185,12 +207,14 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
avgEfflWqltTn += efflWqltTn;
avgEfflWqltTp += efflWqltTp;
avgefflWqltToc += efflWqltToc;
+ avgefflWqltCod += efflWqltCod;
avgEfflWqltSs += efflWqltSs;
avginflAssctBfrWqltBod += inflAssctBfrWqltBod;
avginflAssctBfrWqltTn += inflAssctBfrWqltTn;
avgInflAssctBfrWqltTp += inflAssctBfrWqltTp;
avginflAssctBfrWqltToc += inflAssctBfrWqltToc;
+ avginflAssctBfrWqltCod += inflAssctBfrWqltCod;
avginflAssctBfrWqltSs += inflAssctBfrWqltSs;
if(item.noProcessInflAmnt && item.noProcessInflAmnt.toString().trim() != '' && item.noProcessInflAmnt != undefined){
@@ -207,16 +231,18 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
const newFilteredData = [
{
msrDt: '평균',
- efflWqltBod: filteredData.length==0?'0.0':(Math.round(avgEfflWqltBod / filteredData.length * 10) / 10).toFixed(1),
- efflWqltToc: filteredData.length==0?'0.0':(Math.round(avgefflWqltToc / filteredData.length * 10) / 10).toFixed(1),
- efflWqltSs: filteredData.length==0?'0.0':(Math.round(avgEfflWqltSs / filteredData.length * 10) / 10).toFixed(1),
- efflWqltTn: filteredData.length==0?'0.000':(Math.round(avgEfflWqltTn / filteredData.length * 1000) / 1000).toFixed(3),
- efflWqltTp: filteredData.length==0?'0.000':(Math.round(avgEfflWqltTp / filteredData.length * 1000) / 1000).toFixed(3),
- inflAssctBfrWqltBod: filteredData.length==0?'0.0':(Math.round(avginflAssctBfrWqltBod / filteredData.length * 10) / 10).toFixed(1),
- inflAssctBfrWqltTn: filteredData.length==0?'0.000':(Math.round(avginflAssctBfrWqltTn / filteredData.length * 1000) / 1000).toFixed(3),
- inflAssctBfrWqltTp: filteredData.length==0?'0.000':(Math.round(avgInflAssctBfrWqltTp / filteredData.length * 1000) / 1000).toFixed(3),
- inflAssctBfrWqltToc: filteredData.length==0?'0.0':(Math.round(avginflAssctBfrWqltToc / filteredData.length * 10) / 10).toFixed(1),
- inflAssctBfrWqltSs: filteredData.length==0?'0.0':(Math.round(avginflAssctBfrWqltSs / filteredData.length * 10) / 10).toFixed(1),
+ efflWqltBod: filteredData.length==0 || avgEfflWqltBod===0?'0.0':roundNumber((avgEfflWqltBod / filteredData.length), 1),
+ efflWqltToc: filteredData.length==0 || avgefflWqltToc===0?'0.0':roundNumber((avgefflWqltToc / filteredData.length), 1),
+ efflWqltCod: filteredData.length==0 || avgefflWqltCod===0?"(0.0)":"("+roundNumber((avgefflWqltCod / filteredData.length), 1)+")",
+ efflWqltSs: filteredData.length==0 || avgEfflWqltSs===0?'0.0':roundNumber((avgEfflWqltSs / filteredData.length), 1),
+ efflWqltTn: filteredData.length==0 || avgEfflWqltTn ===0?'0.000':roundNumber((avgEfflWqltTn / filteredData.length), 3),
+ efflWqltTp: filteredData.length==0 || avgEfflWqltTp ===0?'0.000':roundNumber((avgEfflWqltTp / filteredData.length), 3),
+ inflAssctBfrWqltBod: filteredData.length==0 || avginflAssctBfrWqltBod===0?'0.0':roundNumber((avginflAssctBfrWqltBod / filteredData.length), 1),
+ inflAssctBfrWqltTn: filteredData.length==0 || avginflAssctBfrWqltTn===0?'0.000':roundNumber((avginflAssctBfrWqltTn / filteredData.length), 3),
+ inflAssctBfrWqltTp: filteredData.length==0 || avgInflAssctBfrWqltTp===0?'0.000':roundNumber((avgInflAssctBfrWqltTp / filteredData.length), 3),
+ inflAssctBfrWqltToc: filteredData.length==0 || avginflAssctBfrWqltToc===0?'0.0':roundNumber((avginflAssctBfrWqltToc / filteredData.length), 1),
+ inflAssctBfrWqltCod: filteredData.length==0 || avginflAssctBfrWqltCod===0?'(0.0)':"("+roundNumber((avginflAssctBfrWqltCod / filteredData.length), 1)+")",
+ inflAssctBfrWqltSs: filteredData.length==0 || avginflAssctBfrWqltSs===0?'0.0':roundNumber((avginflAssctBfrWqltSs / filteredData.length), 1),
bscFctCd: "",
bscFctNm: "",
lclgvrnmntNm: "",
@@ -225,22 +251,24 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
addr: "",
fctCpc: 0,
noProcessInflAmnt : roundNumber(avgNoProcessInflAmnt / noProcessInflAmntCnt, 0),
- infoRnDay: filteredData.length==0?'0.0':(Math.round(avgInfoRnDay / filteredData.length * 10) / 10).toFixed(1),
- tpInflWqltBod: filteredData.length==0?'0.0':(Math.round(avgTpInflWqltBod / tpInflWqltBodCnt * 10) / 10).toFixed(1),
- tpInflWqltTp: filteredData.length==0?'0.000':(Math.round(avgTpInflWqltTp / tpInflWqltTpCnt * 1000) / 1000).toFixed(3)
+ infoRnDay: filteredData.length==0 || avgInfoRnDay===0?'0.0':roundNumber(avgInfoRnDay / filteredData.length, 1),
+ tpInflWqltBod: filteredData.length==0 || avgTpInflWqltBod ===0 ?'0.0':roundNumber(avgTpInflWqltBod / tpInflWqltBodCnt, 1),
+ tpInflWqltTp: filteredData.length==0 || avgTpInflWqltTp === 0?'0.000':roundNumber(avgTpInflWqltTp / tpInflWqltTpCnt, 3)
},
{
msrDt : '최대',
- efflWqltBod : Math.round(maxEfflWqltBod * 10) / 10?(Math.round(maxEfflWqltBod * 10) / 10).toFixed(1):'0.0',
- efflWqltToc : Math.round(maxefflWqltToc * 10) / 10?(Math.round(maxefflWqltToc * 10) / 10).toFixed(1):'0.0',
- efflWqltSs : Math.round(maxEfflWqltSs * 10) / 10?(Math.round(maxEfflWqltSs * 10) / 10).toFixed(1):'0.0',
- efflWqltTn : Math.round(maxEfflWqltTn * 1000) / 1000?(Math.round(maxEfflWqltTn * 1000) / 1000).toFixed(3):'0.000',
- efflWqltTp : Math.round(maxEfflWqltTp * 1000) / 1000?(Math.round(maxEfflWqltTp * 1000) / 1000).toFixed(3):'0.000',
- inflAssctBfrWqltBod : Math.round(maxinflAssctBfrWqltBod * 10) / 10?(Math.round(maxinflAssctBfrWqltBod * 10) / 10).toFixed(1):'0.0',
- inflAssctBfrWqltTn : Math.round(maxinflAssctBfrWqltTn * 1000) / 1000?(Math.round(maxinflAssctBfrWqltTn * 1000) / 1000).toFixed(3):'0.000',
- inflAssctBfrWqltTp : Math.round(maxInflAssctBfrWqltTp * 1000) / 1000?(Math.round(maxInflAssctBfrWqltTp * 1000) / 1000).toFixed(3):'0.000',
- inflAssctBfrWqltToc : Math.round(maxinflAssctBfrWqltToc * 10) / 10?(Math.round(maxinflAssctBfrWqltToc * 10) / 10).toFixed(1):'0.0',
- inflAssctBfrWqltSs : Math.round(maxinflAssctBfrWqltSs * 10) / 10?(Math.round(maxinflAssctBfrWqltSs * 10) / 10).toFixed(1):'0.0',
+ efflWqltBod : Math.round(maxEfflWqltBod * 10) / 10?roundNumber(maxEfflWqltBod, 1):'0.0',
+ efflWqltToc : Math.round(maxefflWqltToc * 10) / 10?roundNumber(maxefflWqltToc, 1):'0.0',
+ efflWqltCod : Math.round(maxefflWqltCod * 10) / 10?"("+roundNumber(maxefflWqltCod, 1)+")":'(0.0)',
+ efflWqltSs : Math.round(maxEfflWqltSs * 10) / 10?roundNumber(maxEfflWqltSs, 1):'0.0',
+ efflWqltTn : Math.round(maxEfflWqltTn * 1000) / 1000?roundNumber(maxEfflWqltTn, 3):'0.000',
+ efflWqltTp : Math.round(maxEfflWqltTp * 1000) / 1000?roundNumber(maxEfflWqltTp, 3):'0.000',
+ inflAssctBfrWqltBod : Math.round(maxinflAssctBfrWqltBod * 10) / 10?roundNumber(maxinflAssctBfrWqltBod, 1):'0.0',
+ inflAssctBfrWqltTn : Math.round(maxinflAssctBfrWqltTn * 1000) / 1000?roundNumber(maxinflAssctBfrWqltTn, 3):'0.000',
+ inflAssctBfrWqltTp : Math.round(maxInflAssctBfrWqltTp * 1000) / 1000?roundNumber(maxInflAssctBfrWqltTp, 3):'0.000',
+ inflAssctBfrWqltToc : Math.round(maxinflAssctBfrWqltToc * 10) / 10?roundNumber(maxinflAssctBfrWqltToc, 1):'0.0',
+ inflAssctBfrWqltCod : Math.round(maxinflAssctBfrWqltCod * 10) / 10?"("+roundNumber(maxinflAssctBfrWqltCod, 1)+")":'(0.0)',
+ inflAssctBfrWqltSs : Math.round(maxinflAssctBfrWqltSs * 10) / 10?roundNumber(maxinflAssctBfrWqltSs, 1):'0.0',
bscFctCd: "",
bscFctNm: "",
lclgvrnmntNm: "",
@@ -249,22 +277,24 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
addr: "",
fctCpc: 0,
noProcessInflAmnt : roundNumber(maxNoProcessInflAmnt, 0),
- infoRnDay: Math.round(maxInfoRnDay * 10) / 10?(Math.round(maxInfoRnDay * 10) / 10).toFixed(1):'0.0',
- tpInflWqltBod: Math.round(maxTpInflWqltBod * 10) / 10?(Math.round(maxTpInflWqltBod * 10) / 10).toFixed(1):'0.0',
- tpInflWqltTp: Math.round(maxTpInflWqltTp * 1000) / 1000?(Math.round(maxTpInflWqltTp * 1000) / 1000).toFixed(3):'0.000'
+ infoRnDay: Math.round(maxInfoRnDay * 10) / 10?roundNumber(maxInfoRnDay, 1):'0.0',
+ tpInflWqltBod: Math.round(maxTpInflWqltBod * 10) / 10?roundNumber(maxTpInflWqltBod, 1):'0.0',
+ tpInflWqltTp: Math.round(maxTpInflWqltTp * 1000) / 1000?roundNumber(maxTpInflWqltTp, 3):'0.000'
},
{
msrDt : '최소',
- efflWqltBod : Math.round(minEfflWqltBod * 10) / 10?(Math.round(minEfflWqltBod * 10) / 10).toFixed(1) : '0.0',
- efflWqltToc : Math.round(minefflWqltToc * 10) / 10?(Math.round(minefflWqltToc * 10) / 10).toFixed(1) : '0.0',
- efflWqltSs : Math.round(minEfflWqltSs * 10) / 10?(Math.round(minEfflWqltSs * 10) / 10).toFixed(1) : '0.0',
- efflWqltTn : Math.round(minEfflWqltTn * 1000) / 1000?(Math.round(minEfflWqltTn * 1000) / 1000).toFixed(3) : '0.000',
- efflWqltTp : Math.round(minEfflWqltTp * 1000) / 1000?(Math.round(minEfflWqltTp * 1000) / 1000).toFixed(3) : '0.000',
- inflAssctBfrWqltBod : Math.round(mininflAssctBfrWqltBod * 10) / 10?(Math.round(mininflAssctBfrWqltBod * 10) / 10).toFixed(1) : '0.0',
- inflAssctBfrWqltTn : Math.round(mininflAssctBfrWqltTn * 1000) / 1000?(Math.round(mininflAssctBfrWqltTn * 1000) / 1000).toFixed(3) : '0.000',
- inflAssctBfrWqltTp : Math.round(minInflAssctBfrWqltTp * 1000) / 1000?(Math.round(minInflAssctBfrWqltTp * 1000) / 1000).toFixed(3) : '0.000',
- inflAssctBfrWqltToc : Math.round(mininflAssctBfrWqltToc * 10) / 10?(Math.round(mininflAssctBfrWqltToc * 10) / 10).toFixed(1) : '0.0',
- inflAssctBfrWqltSs : Math.round(mininflAssctBfrWqltSs * 10) / 10?(Math.round(mininflAssctBfrWqltSs * 10) / 10).toFixed(1) : '0.0',
+ efflWqltBod : Math.round(minEfflWqltBod * 10) / 10?roundNumber(minEfflWqltBod, 1) : '0.0',
+ efflWqltToc : Math.round(minefflWqltToc * 10) / 10?roundNumber(minefflWqltToc, 1) : '0.0',
+ efflWqltCod : Math.round(minefflWqltCod * 10) / 10?"("+roundNumber(minefflWqltCod, 1)+")" : '(0.0)',
+ efflWqltSs : Math.round(minEfflWqltSs * 10) / 10?roundNumber(minEfflWqltSs, 1) : '0.0',
+ efflWqltTn : Math.round(minEfflWqltTn * 1000) / 1000?roundNumber(minEfflWqltTn, 3) : '0.000',
+ efflWqltTp : Math.round(minEfflWqltTp * 1000) / 1000?roundNumber(minEfflWqltTp, 3) : '0.000',
+ inflAssctBfrWqltBod : Math.round(mininflAssctBfrWqltBod * 10) / 10?roundNumber(mininflAssctBfrWqltBod, 1) : '0.0',
+ inflAssctBfrWqltTn : Math.round(mininflAssctBfrWqltTn * 1000) / 1000?roundNumber(mininflAssctBfrWqltTn, 3) : '0.000',
+ inflAssctBfrWqltTp : Math.round(minInflAssctBfrWqltTp * 1000) / 1000?roundNumber(minInflAssctBfrWqltTp, 3) : '0.000',
+ inflAssctBfrWqltToc : Math.round(mininflAssctBfrWqltToc * 10) / 10?roundNumber(mininflAssctBfrWqltToc, 1) : '0.0',
+ inflAssctBfrWqltCod : Math.round(mininflAssctBfrWqltCod * 10) / 10?"("+roundNumber(mininflAssctBfrWqltCod, 1)+")" : '(0.0)',
+ inflAssctBfrWqltSs : Math.round(mininflAssctBfrWqltSs * 10) / 10?roundNumber(mininflAssctBfrWqltSs, 1) : '0.0',
bscFctCd: "",
bscFctNm: "",
lclgvrnmntNm: "",
@@ -273,9 +303,9 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
addr: "",
fctCpc: 0,
noProcessInflAmnt : roundNumber(minNoProcessInflAmnt, 0),
- infoRnDay: Math.round(minInfoRnDay * 10) / 10?'0.0':(Math.round(minInfoRnDay * 10) / 10).toFixed(1),
- tpInflWqltBod: Math.round(minTpInflWqltBod * 10) / 10 && minTpInflWqltBod != 99999999?(Math.round(minTpInflWqltBod * 10) / 10).toFixed(1):'0.0',
- tpInflWqltTp: Math.round(minTpInflWqltTp * 1000) / 1000 && minTpInflWqltTp != 99999999?(Math.round(minTpInflWqltTp * 1000) / 1000).toFixed(3):'0.000'
+ infoRnDay: Math.round(minInfoRnDay * 10) / 10?'0.0':roundNumber(minInfoRnDay, 1),
+ tpInflWqltBod: Math.round(minTpInflWqltBod * 10) / 10 && minTpInflWqltBod != 99999999?roundNumber(minTpInflWqltBod, 1):'0.0',
+ tpInflWqltTp: Math.round(minTpInflWqltTp * 1000) / 1000 && minTpInflWqltTp != 99999999?roundNumber(minTpInflWqltTp, 3):'0.000'
},
...filteredData
];
@@ -364,7 +394,7 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
- {msrmtDate != yesterDayStr?.replaceAll('-','')?※전날 데이터 결측으로 인해 가장 최근 데이터 표출함 : ''}
+ {msrmtDate != yesterDayStr?.replaceAll('-','') ? (
+
- ☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD) ☞ 음수값 발생시 제외(null, 평균값 산정시 제외)
@@ -441,7 +469,7 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
- ☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD) ☞ 음수값 발생시 제외(null, 평균값 산정시 제외)
@@ -472,7 +496,7 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
- ☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD) ☞ 음수값 발생시 제외(null, 평균값 산정시 제외) ☞ 청천시 : 강우량이 3mm미만의 날
-
+
@@ -504,7 +524,7 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
- ☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD) ☞ 음수값 발생시 제외(null, 평균값 산정시 제외) ☞ 강우량 3mm 이상만 날과 강우영향일(강우일+2일)의 날
-
+
diff --git a/apps/fo/app/pages/(with-layout)/facilityWaterQlty/page.tsx b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/page.tsx
index 98f5ba57a..5367a1c22 100644
--- a/apps/fo/app/pages/(with-layout)/facilityWaterQlty/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/facilityWaterQlty/page.tsx
@@ -190,7 +190,7 @@ export default function ProcessFacilitySearch() {
- index !== undefined && cellClick(index)} headName={"시설별 수질현황"} tableData={mainList} headlist={upheadList} pageSize={10} total={total<10?facilityWaterQltyList.length:total} resetPageNo={resetPage} onPageChange={handlePageChange} />
+ index !== undefined && cellClick(index)} headName={"시설별 수질현황"} tableData={mainList} headlist={upheadList} pageSize={10} total={total<10?facilityWaterQltyList.length:total} resetPageNo={resetPage} onPageChange={handlePageChange} widthFixed={true} />
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 5a38ad8f0..d6166133f 100644
--- a/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx
@@ -8,6 +8,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
import type { ReturnType } from "../../../../components/common/FacilityTermModalHeader";
import { roundUp } from "@/app/store/common";
import { roundNumber } from "@/app/components/common/DataForm";
+import UnderComment from "@/app/components/common/UnderComment";
const tabList = [
{ value: 'tab_term_year', label: '연간' },
@@ -225,10 +226,6 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
boldArray={[0,1,2]}
/>
-
- ☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD) ☞ 음수값 발생시 제외(null, 평균값 산정시 제외)
@@ -253,10 +250,6 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
boldArray={[0,1,2]}
/>
-
- ☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD) ☞ 음수값 발생시 제외(null, 평균값 산정시 제외)
@@ -281,10 +274,6 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
boldArray={[0,1,2]}
/>
-
- ☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD) ☞ 음수값 발생시 제외(null, 평균값 산정시 제외)
@@ -309,11 +298,6 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
boldArray={[0,1,2]}
/>
-
- ☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD) ☞ 음수값 발생시 제외(null, 평균값 산정시 제외) ☞ 청천시 : 강우량이 3mm미만의 날
-
@@ -328,11 +312,7 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
{}} className="h-[370px]" boldArray={[0,1,2]}/>
-
- ☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD) ☞ 음수값 발생시 제외(null, 평균값 산정시 제외) ☞ 강우량 3mm 이상만 날과 강우영향일(강우일+2일)의 날
-
+
diff --git a/apps/fo/app/pages/(with-layout)/flowRate/page.tsx b/apps/fo/app/pages/(with-layout)/flowRate/page.tsx
index bec068858..85fcaef88 100644
--- a/apps/fo/app/pages/(with-layout)/flowRate/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/flowRate/page.tsx
@@ -192,7 +192,7 @@ export default function ProcessFacilitySearch() {
- index !== undefined && cellClick(index)} headName={"시설별 유량현황"} tableData={flowRateList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} />
+ index !== undefined && cellClick(index)} headName={"시설별 유량현황"} tableData={flowRateList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} widthFixed={true} />
diff --git a/apps/fo/app/pages/(with-layout)/planSewage/page.tsx b/apps/fo/app/pages/(with-layout)/planSewage/page.tsx
index 00539da13..37fcb5b01 100644
--- a/apps/fo/app/pages/(with-layout)/planSewage/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/planSewage/page.tsx
@@ -5,7 +5,14 @@ import { downloadExcel, MainDiv, SearchBaseForm, SearchInput, SelectBox, Title,
import ListDiv from "@common/business_components/ui/list_div";
import { useCallback, useEffect, useRef, useState } from "react";
import LoadingOverlay from "@common/business_components/ui/loadingBar";
-
+import UnderComment from "@/app/components/common/UnderComment";
+
+const commentArray = [
+ "여유용량 = 하수처리시설 시설용량 – 건기시 유입유량(평균)",
+ "변동부하율 = 건기시 일최대 유량/일평균유량(기준 최근 3개년)",
+ "분류식화율 = 분류식지역 면적(㎢) / 처리구역 면적합계(㎢) ×100"
+]
+
export default function PlanSewage() {
const {Common
,PlanSewage
@@ -135,12 +142,14 @@ export default function PlanSewage() {
default:
if(sidoValue !== '0') nameCd = sidoValue;
if(sigunValue !== '0') nameCd = sigunValue;
- partStr = envPartValue !== '0' ? envPartValue:partValue;
- break;
+ partStr = envPartValue !== '0' ? envPartValue:partValue;
+ break;
}
if (partStr.length > 1 || fcltCpct !== '0' || operationValue!== '0' ||nameCd ||(fcltyName.trim() !== "" && fcltyName.trim() !== null)) {
searchPlanSewageList(pageNo, pageCnt, searchYear, partStr, nameCd || '0', fcltCpct, operationValue, fcltyName.trim() !== "" || fcltyName.trim() !== null ? fcltyName : undefined);
} else {
+ // G로 넘기면 데이터가 안떠서 환경청 전체로 넘기면 전체를 추출하기위해서...
+ partValue = partValue==='G'?'A':partValue;
searchPlanSewageList(pageNo, pageCnt, searchYear, partValue);
}
}, [operationValue, fcltyName, searchPlanSewageList, searchYear, fcltCpct]);
@@ -191,13 +200,9 @@ export default function PlanSewage() {
-
-
- ☞ 여유용량 = 하수처리시설 시설용량 – 건기시 유입유량(평균) ☞ 변동부하율 = 건기시 일최대 유량/일평균유량(기준 최근 3개년) ☞ 분류식화율 = 분류식지역 면적(㎢) / 처리구역 면적합계(㎢) ×100
+
diff --git a/apps/fo/app/pages/(with-layout)/processArea/page.tsx b/apps/fo/app/pages/(with-layout)/processArea/page.tsx
index 24a30d910..746f9a111 100644
--- a/apps/fo/app/pages/(with-layout)/processArea/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/processArea/page.tsx
@@ -157,7 +157,7 @@ export default function ProcessArea() {
- index !== undefined && cellClick(index)} headName={"처리구역정보"} tableData={mainList} headlist={upHeadList1} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} />
+ index !== undefined && cellClick(index)} headName={"처리구역정보"} tableData={mainList} headlist={upHeadList1} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} widthFixed={true} />
diff --git a/apps/fo/app/pages/(with-layout)/processFacility/page.tsx b/apps/fo/app/pages/(with-layout)/processFacility/page.tsx
index 381c64ea5..7ed2802a2 100644
--- a/apps/fo/app/pages/(with-layout)/processFacility/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/processFacility/page.tsx
@@ -1,11 +1,11 @@
"use client"
-import { HeadMakeColSpan } from "@/app/components/common/HeadMakeColSpan";
+import UnderComment from "@/app/components/common/UnderComment";
import { useFoStore } from "@/app/store";
import { ContentsDiv, downloadExcel, MainDiv, SearchBaseForm, SearchInput, SelectBox, Title, UiModal, UiTable, type ReturnType } from "@common/business_components";
import ListDiv from "@common/business_components/ui/list_div";
+import LoadingOverlay from "@common/business_components/ui/loadingBar";
import { useCallback, useEffect, useRef, useState } from "react";
import ProcessFacilityInfoModal from "./modal/page";
-import LoadingOverlay from "@common/business_components/ui/loadingBar";
export default function ProcessFacilitySearch() {
const {Common
@@ -274,13 +274,13 @@ export default function ProcessFacilitySearch() {
total={total}
resetPageNo={resetPage}
onPageChange={changePage}
+ widthFixed={true}
>
-
+ ※계획유입수질 및 설계유입수질은 해당 BOD를 나타냄
{selectedRow !== null && (
(false);
// 표 너비
- const [widthSize, setWidthSize] = useState("w-[120%]");
+ const [widthSize, setWidthSize] = useState("w-[130%]");
// 구분별 그리드 헤더
const [upheadList, setUpheadList] = useState(upHeadList1);
// 용량별
@@ -149,7 +155,7 @@ export default function Rdi() {
}, [operationValue, fcltyName, searchRdiList, searchYear, fcltCpct]);
const chkVal = useCallback((returntype:ReturnType) => {
- setWidthSize(returntype.partValue=='A' ?"w-[120%]":"w-[130%]")
+ setWidthSize(returntype.partValue=='A' ?"w-[130%]":"w-[150%]")
setUpheadList(returntype.partValue == 'R' ? upHeadList2 : returntype.partValue == 'G'?upHeadList3:upHeadList1);
setResetPage(true);
}, [upHeadList1, upHeadList2, upHeadList3]);
@@ -195,10 +201,9 @@ export default function Rdi() {
-
-
※ 강우시 총 추정유입량 = 청천시 유입하수량 + RDII 추정값
-
※ 주) 처리장 유입부에서 측정된 유량 및 수질조사 자료를 기준으로 산정된 결과임
+
diff --git a/apps/fo/app/pages/(with-layout)/sewageOccur/modal/page.tsx b/apps/fo/app/pages/(with-layout)/sewageOccur/modal/page.tsx
index 37cadc7c6..f09d2f149 100644
--- a/apps/fo/app/pages/(with-layout)/sewageOccur/modal/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/sewageOccur/modal/page.tsx
@@ -142,7 +142,7 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd
{"엑셀다운로드"}
- {}} boldArray={[0, 1, 2]}>
+ {}} boldArray={[0, 1, 2]} widthFixed={true} >
diff --git a/apps/fo/app/pages/(with-layout)/sewageOccur/page.tsx b/apps/fo/app/pages/(with-layout)/sewageOccur/page.tsx
index 885af7567..23f764269 100644
--- a/apps/fo/app/pages/(with-layout)/sewageOccur/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/sewageOccur/page.tsx
@@ -222,7 +222,7 @@ export default function PlanSewage() {
- index !== undefined && cellClick(index)} headName={"오수발생량 추정"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} />
+ index !== undefined && cellClick(index)} headName={"오수발생량 추정"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} widthFixed={true} />
diff --git a/apps/fo/app/pages/(with-layout)/underWaterInput/modal/page.tsx b/apps/fo/app/pages/(with-layout)/underWaterInput/modal/page.tsx
index 1d4ea2310..5da9622d0 100644
--- a/apps/fo/app/pages/(with-layout)/underWaterInput/modal/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/underWaterInput/modal/page.tsx
@@ -166,6 +166,7 @@ export default function UnderWaterInputModal({fcltyCd='', fcltyName='',searchYea
onPageChange={() => {}}
className="h-[200px]"
boldArray={[0,1,2]}
+ widthFixed={true}
/>
@@ -233,6 +234,7 @@ export default function UnderWaterInputModal({fcltyCd='', fcltyName='',searchYea
onPageChange={() => { } }
className="h-[500px]"
boldArray={[0,1,2]}
+ widthFixed={true}
/>
@@ -291,6 +293,7 @@ export default function UnderWaterInputModal({fcltyCd='', fcltyName='',searchYea
onPageChange={() => {}}
className="h-[500px]"
boldArray={[0,1,2]}
+ widthFixed={true}
/>
diff --git a/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx b/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx
index 2126a31a0..6d8172bce 100644
--- a/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx
+++ b/apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx
@@ -220,7 +220,7 @@ export default function UnderWaterInput() {
- index !== undefined && cellClick(index)} headName={"지하수유입량 추정"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} />
+ index !== undefined && cellClick(index)} headName={"지하수유입량 추정"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} widthFixed={true}/>
※적정여부 = 연간 지하수유입량/연평균 유입하수량*100 });
- DataForm({ type: 'float1', column: 'totalYearRain', item: item as unknown as Record});
-};
-
export type FacilityPrecipitationType = {
FacilityPrecipitationSearch: {
isInit: boolean;
@@ -246,13 +243,16 @@ export const facilityPrecipitationReducer:(set:(fn: (state: FacilityPrecipitatio
const res = await fetchFacilityPrecipitationList(pageNo, pageSize, searchYear, part, nameCd, fcltCpct, operationValue, fcltyNm);
const data = res.data;
+
+ data.forEach(item => {
+ item.fctCpc = roundNumber(item.fctCpc, 0);
+ item.totalYearRain = roundNumber(item.totalYearRain, 1);
+ });
+
const excelDownList: ExcelType[] = [];
if(pageSize>5000){
data.forEach((item: FacilityPrecipitationProps) => {
- dataFormSetting(item)
- item.fctCpc = item.fctCpc ? parseFloat(item.fctCpc.toString().replace(/,/g, '')) : 0;
- item.totalYearRain = item.totalYearRain ? parseFloat(item.totalYearRain.toString().replace(/,/g, '')) : 0;
excelDownList.push({
시설코드: item.bscFctCd,
권역: item.rvbsn,
@@ -270,18 +270,12 @@ export const facilityPrecipitationReducer:(set:(fn: (state: FacilityPrecipitatio
"연간총강수량(mm)": item.totalYearRain,
})
})
- }else{
- data.forEach((item: FacilityPrecipitationProps) => {
- dataFormSetting(item)
- item.fctCpc = item.fctCpc ? parseFloat(item.fctCpc.toString().replace(/,/g, '')) : 0;
- item.totalYearRain = item.totalYearRain ? parseFloat(item.totalYearRain.toString().replace(/,/g, '')) : 0;
- })
}
set((state:FacilityPrecipitationType) => ({
...state,
FacilityPrecipitation: pageSize<5000?{
...state.FacilityPrecipitation,
- facilityPrecipitation: res.data,
+ facilityPrecipitation: data,
facilityPrecipitationCount: res.count,
isLoading : false,
}:{
diff --git a/apps/fo/app/store/facilityWaterQlty/index.tsx b/apps/fo/app/store/facilityWaterQlty/index.tsx
index f8b874c85..c60f72cd2 100644
--- a/apps/fo/app/store/facilityWaterQlty/index.tsx
+++ b/apps/fo/app/store/facilityWaterQlty/index.tsx
@@ -2,6 +2,7 @@
import DataForm, { roundNumber } from "@/app/components/common/DataForm";
import type { TableUpperProps } from "../dashboard";
import CalcRainEffect from "@/app/components/common/CalcRainEffect";
+import { COD_YEAR } from "../common";
export type { TableUpperProps };
/**====================================
@@ -26,6 +27,8 @@ export interface FacilityWaterQltyProps {
inflAssctAftWqltBod: string | '',
inflAssctBfrWqltToc: string | '',
inflAssctAftWqltToc: string | '',
+ inflAssctBfrWqltCod : string | '',
+ inflAssctAftWqltCod : string | '',
inflAssctBfrWqltSs: string | '',
inflAssctAftWqltSs: string | '',
inflAssctBfrWqltTn: string | '',
@@ -34,6 +37,7 @@ export interface FacilityWaterQltyProps {
inflAssctAftWqltTp: string | '',
efflWqltBod: string | '',
efflWqltToc: string | '',
+ efflWqltCod : string | '',
efflWqltSs: string | '',
efflWqltTn: string | '',
efflWqltTp: string | '',
@@ -124,74 +128,74 @@ const mainLabelArray: string[] = ['구분', '시도', '시군구', '용량별',
// 시설수질리스트 헤더(행정별)
const upHeadList1: TableUpperProps[] = [
- { id: "C", title: "행정명", colSpan: 2, row: 0 },
- { id: "sidoNm", title: "시도", row: 1 },
- { id: "sggNm", title: "시군구", row: 1 },
- { id: "bscFctNm", title: "시설명", rowSpan: 2, row: 0 },
+ { id: "C", title: "행정명", colSpan: 2, row:0, widthPercent:10 },
+ { id: "sidoNm", title: "시도", row: 1, widthPercent:5},
+ { id: "sggNm", title: "시군구", row: 1, widthPercent:5 },
+ { id: "bscFctNm", title: "시설명", rowSpan: 2, row: 0, widthPercent: 10 },
{ id: "addr", title: "주소", rowSpan: 2, row: 0 },
- { id: "fctCpc", title: "시설용량(m³/일)", align: "right", rowSpan: 2, row: 0 },
- { id: "A", title: "유입", colSpan: 5, row: 0 },
- { id: "B", title: "방류", colSpan: 5, row: 0 },
- { id: "inflAssctBfrWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe3", upSequnce: 1, align: "right", row: 1 },
- { id: "inflAssctBfrWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe3", upSequnce: 2, align: "right", row: 1 },
- { id: "inflAssctBfrWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row: 1 },
- { id: "inflAssctBfrWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe3", upSequnce: 4, align: "right", row: 1 },
- { id: "inflAssctBfrWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row: 1 },
- { id: "efflWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe4", upSequnce: 1, align: "right", row: 1 },
- { id: "efflWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe4", upSequnce: 2, align: "right", row: 1 },
- { id: "efflWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row: 1 },
- { id: "efflWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe4", upSequnce: 4, align: "right", row: 1 },
- { id: "efflWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row: 1 },
+ { id: "fctCpc", title: "시설용량(m³/일)", align: "right", rowSpan: 2, row: 0, widthPercent:10 },
+ { id: "A", title: "유입", colSpan: 5, row: 0, widthPercent:25 },
+ { id: "B", title: "방류", colSpan: 5, row: 0, widthPercent:25 },
+ { id: "inflAssctBfrWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe3", upSequnce: 1, align: "right", row: 1, widthPercent:5 },
+ { id: "inflAssctBfrWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe3", upSequnce: 2, align: "right", row: 1, widthPercent:5 },
+ { id: "inflAssctBfrWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row: 1, widthPercent:5 },
+ { id: "inflAssctBfrWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe3", upSequnce: 4, align: "right", row: 1, widthPercent:5 },
+ { id: "inflAssctBfrWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row: 1, widthPercent:5 },
+ { id: "efflWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe4", upSequnce: 1, align: "right", row: 1, widthPercent:5 },
+ { id: "efflWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe4", upSequnce: 2, align: "right", row: 1, widthPercent:5 },
+ { id: "efflWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row: 1, widthPercent:5 },
+ { id: "efflWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe4", upSequnce: 4, align: "right", row: 1, widthPercent:5 },
+ { id: "efflWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row: 1, widthPercent:5 },
];
// 시설수질리스트 헤더(권역별)
const upHeadList2: TableUpperProps[] = [
- { id: "C", title: "유역", colSpan: 3, row: 0 },
- { id: "rvbsn", title: "권역", upName: "upChangeRe1", upSequnce: 1, row:1 },
- { id: "lgbsn", title: "단위유역", upName: "upChangeRe1", upSequnce: 2, row:1 },
- { id: "mdmbsn", title: "중권역", upName: "upChangeRe1", upSequnce: 3, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "C", title: "유역", colSpan: 3, row: 0, widthPercent:15 },
+ { id: "rvbsn", title: "권역", upName: "upChangeRe1", upSequnce: 1, row:1, widthPercent:5 },
+ { id: "lgbsn", title: "단위유역", upName: "upChangeRe1", upSequnce: 2, row:1, widthPercent:5 },
+ { id: "mdmbsn", title: "중권역", upName: "upChangeRe1", upSequnce: 3, row:1, widthPercent:5 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent:10 },
{ id: "addr", title: "주소", row:0, rowSpan:2 },
- { id: "fctCpc", title: "시설용량(m³/L)", align: "right", row:0, rowSpan:2 },
- { id: "A", title: "유입", colSpan: 5, row: 0 },
- { id: "B", title: "방류", colSpan: 5, row: 0 },
- { id: "inflAssctBfrWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe3", upSequnce: 1, align: "right", row:1 },
- { id: "inflAssctBfrWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe3", upSequnce: 2, align: "right", row:1 },
- { id: "inflAssctBfrWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row:1 },
- { id: "inflAssctBfrWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe3", upSequnce: 2, align: "right", row:1 },
- { id: "inflAssctBfrWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row:1 },
- { id: "efflWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe4", upSequnce: 1, align: "right", row:1 },
- { id: "efflWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe4", upSequnce: 2, align: "right", row:1 },
- { id: "efflWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row:1 },
- { id: "efflWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe4", upSequnce: 2, align: "right", row:1 },
- { id: "efflWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row:1 },
+ { id: "fctCpc", title: "시설용량(m³/L)", align: "right", row:0, rowSpan:2, widthPercent:8 },
+ { id: "A", title: "유입", colSpan: 5, row: 0, widthPercent:25 },
+ { id: "B", title: "방류", colSpan: 5, row: 0, widthPercent:25 },
+ { id: "inflAssctBfrWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe3", upSequnce: 1, align: "right", row:1, widthPercent:5 },
+ { id: "inflAssctBfrWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe3", upSequnce: 2, align: "right", row:1, widthPercent:5 },
+ { id: "inflAssctBfrWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row:1, widthPercent:5 },
+ { id: "inflAssctBfrWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe3", upSequnce: 2, align: "right", row:1, widthPercent:5 },
+ { id: "inflAssctBfrWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row:1, widthPercent:5 },
+ { id: "efflWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe4", upSequnce: 1, align: "right", row:1, widthPercent:5 },
+ { id: "efflWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe4", upSequnce: 2, align: "right", row:1, widthPercent:5 },
+ { id: "efflWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row:1, widthPercent:5 },
+ { id: "efflWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe4", upSequnce: 2, align: "right", row:1, widthPercent:5 },
+ { id: "efflWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row:1, widthPercent:5 },
];
// 시설수질리스트 헤더(환경청별)
const upHeadList3: TableUpperProps[] = [
- { id: "C", title: "유역", colSpan: 3, row: 0 },
- { id: "rvbsn", title: "권역", row:1 },
- { id: "lgbsn", title: "단위유역", row:1 },
- { id: "mdmbsn", title: "중권역", row:1 },
- { id: "rgnNm", title: "환경청", row:0, rowSpan:2 },
- { id: "D", title: "행정명", colSpan: 2, row: 0 },
- { id: "sidoNm", title: "시도", upName: "upChangeRe2", row:1 },
- { id: "sggNm", title: "시군구", upName: "upChangeRe2", row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "C", title: "유역", colSpan: 3, row: 0, widthPercent: 15 },
+ { id: "rvbsn", title: "권역", row:1, widthPercent: 5 },
+ { id: "lgbsn", title: "단위유역", row:1, widthPercent: 5 },
+ { id: "mdmbsn", title: "중권역", row:1, widthPercent: 5 },
+ { id: "rgnNm", title: "환경청", row:0, rowSpan:2, widthPercent: 7 },
+ { id: "D", title: "행정명", colSpan: 2, row: 0, widthPercent: 10 },
+ { id: "sidoNm", title: "시도", upName: "upChangeRe2", row:1, widthPercent: 5 },
+ { id: "sggNm", title: "시군구", upName: "upChangeRe2", row:1, widthPercent: 5 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 8 },
{ id: "addr", title: "주소", row:0, rowSpan:2 },
- { id: "fctCpc", title: "시설용량(m³/L)", align: "right", row:0, rowSpan:2 },
- { id: "A", title: "유입", colSpan: 5, row: 0 },
- { id: "B", title: "방류", colSpan: 5, row: 0 },
- { id: "inflAssctBfrWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe3", upSequnce: 1, align: "right", row:1 },
- { id: "inflAssctBfrWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe3", upSequnce: 2, align: "right", row:1 },
- { id: "inflAssctBfrWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row:1 },
- { id: "inflAssctBfrWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe3", upSequnce: 2, align: "right", row:1 },
- { id: "inflAssctBfrWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row:1 },
- { id: "efflWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe4", upSequnce: 1, align: "right", row:1 },
- { id: "efflWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe4", upSequnce: 2, align: "right", row:1 },
- { id: "efflWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row:1 },
- { id: "efflWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe4", upSequnce: 2, align: "right", row:1 },
- { id: "efflWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row:1 },
+ { id: "fctCpc", title: "시설용량(m³/L)", align: "right", row:0, rowSpan:2, widthPercent: 5 },
+ { id: "A", title: "유입", colSpan: 5, row: 0, widthPercent: 20 },
+ { id: "B", title: "방류", colSpan: 5, row: 0, widthPercent: 20 },
+ { id: "inflAssctBfrWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe3", upSequnce: 1, align: "right", row:1, widthPercent: 4 },
+ { id: "inflAssctBfrWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe3", upSequnce: 2, align: "right", row:1, widthPercent: 4 },
+ { id: "inflAssctBfrWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row:1, widthPercent: 4 },
+ { id: "inflAssctBfrWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe3", upSequnce: 2, align: "right", row:1, widthPercent: 4 },
+ { id: "inflAssctBfrWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe3", upSequnce: 3, align: "right", row:1, widthPercent: 4 },
+ { id: "efflWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe4", upSequnce: 1, align: "right", row:1, widthPercent: 4 },
+ { id: "efflWqltToc", title: "TOC\n(COD)\n(mg/L)", upName: "upChangeRe4", upSequnce: 2, align: "right", row:1, widthPercent: 4 },
+ { id: "efflWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row:1, widthPercent: 4 },
+ { id: "efflWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe4", upSequnce: 2, align: "right", row:1, widthPercent: 4 },
+ { id: "efflWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe4", upSequnce: 3, align: "right", row:1, widthPercent: 4 },
];
/**
@@ -210,7 +214,22 @@ const upHeadListModalYear: TableUpperProps[] = [
{ id: "efflWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe2", upSequnce: 3, align: "right" },
{ id: "efflWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe2", upSequnce: 2, align: "right" },
{ id: "efflWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe2", upSequnce: 3, align: "right" },
- { id: "noProcessInflAmnt", title: "미처리하수량\n(m³/일)", align:"right"},
+ { id: "infoRnDay", title: "강우량\n(mm/일)", align: "right" }
+];
+
+// 처리시설 수질현황 헤더(모달-연간)
+const upHeadListModalYearCod: TableUpperProps[] = [
+ { id: "msrDt", title: "날짜" },
+ { id: "inflAssctBfrWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe1", upSequnce: 1, align: "right" },
+ { id: "inflAssctBfrWqltCod", title: "TOC(COD)\n(mg/L)", upName: "upChangeRe1", upSequnce: 2, align: "right" },
+ { id: "inflAssctBfrWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe1", upSequnce: 3, align: "right" },
+ { id: "inflAssctBfrWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe1", upSequnce: 2, align: "right" },
+ { id: "inflAssctBfrWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe1", upSequnce: 3, align: "right" },
+ { id: "efflWqltBod", title: "BOD\n(mg/L)", upName: "upChangeRe2", upSequnce: 1, align: "right" },
+ { id: "efflWqltCod", title: "TOC(COD)\n(mg/L)", upName: "upChangeRe2", upSequnce: 2, align: "right" },
+ { id: "efflWqltSs", title: "SS\n(mg/L)", upName: "upChangeRe2", upSequnce: 3, align: "right" },
+ { id: "efflWqltTn", title: "T-N\n(mg/L)", upName: "upChangeRe2", upSequnce: 2, align: "right" },
+ { id: "efflWqltTp", title: "T-P\n(mg/L)", upName: "upChangeRe2", upSequnce: 3, align: "right" },
{ id: "infoRnDay", title: "강우량\n(mm/일)", align: "right" }
];
@@ -298,6 +317,7 @@ export type FacilityWaterQltyType = {
FacilityWaterQltyModal: {
// 처리시설 수질현황
upHeadListModalYear: TableUpperProps[];
+ upHeadListModalYearCod : TableUpperProps[];
facilityWaterQltyYearList: FacilityWaterQltyProps[];
upHeadListModalTms: TableUpperProps[];
facilityWaterQltyTmsList: FacilityWaterQltyTmsProps[];
@@ -327,6 +347,7 @@ export const facilityWaterQltyInitState: FacilityWaterQltyType = {
FacilityWaterQltyModal: {
// 처리시설 수질현황
upHeadListModalYear: upHeadListModalYear,
+ upHeadListModalYearCod: upHeadListModalYearCod,
facilityWaterQltyYearList: facilityWaterQltyYearList,
upHeadListModalTms: upHeadListModalTms,
facilityWaterQltyTmsList: facilityWaterQltyTmsList,
@@ -453,8 +474,8 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType
item.fctCpc = parseFloat(item.fctCpc.toString().replace(/,/g, ''));
item.sidoNm = item.lclgvrnmntNm.split(' ')[0]?.toString() || '';
item.sggNm = item.lclgvrnmntNm.split(' ')[1]?.toString() || '';
- item.inflAssctBfrWqltToc = Number(searchYear)<2021? "("+item.inflAssctBfrWqltToc+")" : item.inflAssctBfrWqltToc;
- item.efflWqltToc = Number(searchYear)<2021? "("+item.efflWqltToc+")" : item.efflWqltToc;
+ item.inflAssctBfrWqltToc = Number(searchYear) ({
@@ -625,6 +646,12 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType
if(item.efflWqltToc){
item.efflWqltToc = Number(Math.round(Number(item.efflWqltToc) * 10)/10).toFixed(1);
}
+ if(item.inflAssctBfrWqltCod){
+ item.inflAssctBfrWqltCod = "("+Number(Math.round(Number(item.inflAssctBfrWqltCod) * 10)/10).toFixed(1)+")";
+ }
+ if(item.efflWqltCod){
+ item.efflWqltCod = "("+Number(Math.round(Number(item.efflWqltCod) * 10)/10).toFixed(1)+")";
+ }
if(item.inflAssctBfrWqltBod){
item.inflAssctBfrWqltBod = Number(Math.round(Number(item.inflAssctBfrWqltBod) * 10)/10).toFixed(1);
}
diff --git a/apps/fo/app/store/flowRate/index.tsx b/apps/fo/app/store/flowRate/index.tsx
index f8125e59c..ab9100d09 100644
--- a/apps/fo/app/store/flowRate/index.tsx
+++ b/apps/fo/app/store/flowRate/index.tsx
@@ -95,53 +95,53 @@ export type FlowRateModalProps = {
*/
// 리스트 (행정별)
const upHeadList1:TableUpperProps[] = [
- { id: "A", title: "행정명", row: 0 ,colSpan: 2 },
- { id: "sido", title: "시도", upName:"upChangeRe", row:1 },
- { id: "gugun", title: "시군구", upName:"upChangeRe", row:1 },
- { id: "bscFctNm", title: "시설명", row: 0, rowSpan: 2},
- { id: "daddr", title: "주소", row: 0, rowSpan: 2},
- { id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row: 0, rowSpan: 2},
- { id: "totInflAmnt", title: "총 유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2},
- { id: "inflAmnt", title: "하수유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2},
- { id: "sumFlow", title: '연계처리량\n(m³/일)', align:"right", row: 0, rowSpan: 2},
- { id: "returnAmnt", title: '총인 반류수량\n(m³/일)', align:"right", row: 0, rowSpan: 2},
- { id: "efflAmnt", title: '방류량\n(m³/일)', align:"right", row: 0, rowSpan: 2}
+ { id: "A", title: "행정명", row: 0, colSpan: 2, widthPercent: 16 },
+ { id: "sido", title: "시도", upName:"upChangeRe", row:1, widthPercent: 8 },
+ { id: "gugun", title: "시군구", upName:"upChangeRe", row:1, widthPercent: 8 },
+ { id: "bscFctNm", title: "시설명", row: 0, rowSpan: 2, widthPercent: 10},
+ { id: "daddr", title: "주소", row: 0, rowSpan: 2 },
+ { id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "totInflAmnt", title: "총 유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "inflAmnt", title: "하수유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "sumFlow", title: '연계처리량\n(m³/일)', align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "returnAmnt", title: '총인 반류수량\n(m³/일)', align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "efflAmnt", title: '방류량\n(m³/일)', align:"right", row: 0, rowSpan: 2, widthPercent: 7 }
];
// 리스트 (권역별)
const upHeadList2:TableUpperProps[] = [
- { id: "A", title: "유역", row: 0, colSpan: 3},
- { id: "rvbsn", title: "권역", upName:"upChangeRe", row:1 },
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe", row:1 },
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe", row:1 },
- { id: "bscFctNm", title: "시설명", row: 0, rowSpan: 2},
- { id: "daddr", title: "주소", row: 0, rowSpan: 2},
- { id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row: 0, rowSpan: 2},
- { id: "totInflAmnt", title: "총 유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2},
- { id: "inflAmnt", title: "하수유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2},
- { id: "sumFlow", title: '연계처리량\n(m³/일)', align:"right", row: 0, rowSpan: 2},
- { id: "returnAmnt", title: '총인 반류수량\n(m³/일)', align:"right", row: 0, rowSpan: 2},
- { id: "efflAmnt", title: '방류량\n(m³/일)', align:"right", row: 0, rowSpan: 2}
+ { id: "A", title: "유역", row: 0, colSpan: 3, widthPercent: 24 },
+ { id: "rvbsn", title: "권역", upName:"upChangeRe", row:1, widthPercent: 8 },
+ { id: "lgbsn", title: "단위유역", upName:"upChangeRe", row:1, widthPercent: 8 },
+ { id: "mdmbsn", title: "중권역", upName:"upChangeRe", row:1, widthPercent: 8 },
+ { id: "bscFctNm", title: "시설명", row: 0, rowSpan: 2, widthPercent: 10 },
+ { id: "daddr", title: "주소", row: 0, rowSpan: 2 },
+ { id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row: 0, rowSpan: 2, widthPercent: 10 },
+ { id: "totInflAmnt", title: "총 유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "inflAmnt", title: "하수유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "sumFlow", title: '연계처리량\n(m³/일)', align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "returnAmnt", title: '총인 반류수량\n(m³/일)', align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "efflAmnt", title: '방류량\n(m³/일)', align:"right", row: 0, rowSpan: 2, widthPercent: 7 }
];
// 리스트 (환경청별별)
const upHeadList3:TableUpperProps[] = [
- { id: "A", title: "유역", row: 0, colSpan: 3 },
- { id: "rvbsn", title: "권역", upName:"upChangeRe1", row:1 },
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe1", row:1 },
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe1", row:1 },
- { id: "rgnNm", title: "환경청", row:0, rowSpan:2 },
- { id: "B", title: "행정명", row: 0 ,colSpan: 2 },
- { id: "sido", title: "시도", upName:"upChangeRe2", row:1 },
- { id: "gugun", title: "시군구", upName:"upChangeRe2", row:1 },
- { id: "bscFctNm", title: "시설명", row: 0, rowSpan: 2 },
+ { id: "A", title: "유역", row: 0, colSpan: 3, widthPercent: 15 },
+ { id: "rvbsn", title: "권역", upName:"upChangeRe1", row:1, widthPercent: 5 },
+ { id: "lgbsn", title: "단위유역", upName:"upChangeRe1", row:1, widthPercent: 5 },
+ { id: "mdmbsn", title: "중권역", upName:"upChangeRe1", row:1, widthPercent: 5 },
+ { id: "rgnNm", title: "환경청", row:0, rowSpan:2, widthPercent: 7 },
+ { id: "B", title: "행정명", row: 0 ,colSpan: 2, widthPercent: 10 },
+ { id: "sido", title: "시도", upName:"upChangeRe2", row:1, widthPercent: 5 },
+ { id: "gugun", title: "시군구", upName:"upChangeRe2", row:1, widthPercent: 5 },
+ { id: "bscFctNm", title: "시설명", row: 0, rowSpan: 2, widthPercent: 7 },
{ id: "daddr", title: "주소", row: 0, rowSpan: 2 },
- { id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row: 0, rowSpan: 2 },
- { id: "totInflAmnt", title: "총 유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2 },
- { id: "inflAmnt", title: "하수유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2 },
- { id: "sumFlow", title: '연계처리량\n(m³/일)', align:"right", row: 0, rowSpan: 2 },
- { id: "returnAmnt", title: '총인 반류수량\n(m³/일)', align:"right", row: 0, rowSpan: 2 },
- { id: "efflAmnt", title: '방류량\n(m³/일)', align:"right", row: 0, rowSpan: 2 }
+ { id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "totInflAmnt", title: "총 유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "inflAmnt", title: "하수유입량\n(m³/일)", align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "sumFlow", title: '연계처리량\n(m³/일)', align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "returnAmnt", title: '총인 반류수량\n(m³/일)', align:"right", row: 0, rowSpan: 2, widthPercent: 7 },
+ { id: "efflAmnt", title: '방류량\n(m³/일)', align:"right", row: 0, rowSpan: 2, widthPercent: 7 }
];
const flowRateList:flowRateListProps[] = [
@@ -172,6 +172,7 @@ const fetchFlowRateList = async (pageNo: number, pageSize: number, searchYear: s
try {
const tailStr = partCd ? '/'+ partCd + '/' + nameCd + '/' + fcltCpct + '/' + operationValue + (fcltyNm && fcltyNm !== '' ? '/' + fcltyNm : '') : '';
const url = '/fclt/flow/' + pageNo + '/' + pageSize + '/' + searchYear + tailStr;
+ console.log(url);
const res = await getFetch('fo', url);
return { data: res.data, count: res.count }
} catch (error) {
diff --git a/apps/fo/app/store/planSewage/index.tsx b/apps/fo/app/store/planSewage/index.tsx
index 21a711e8b..80a4d66e7 100644
--- a/apps/fo/app/store/planSewage/index.tsx
+++ b/apps/fo/app/store/planSewage/index.tsx
@@ -47,44 +47,44 @@ const LabelArray:string[] = ['구분', '시도', '시군구','용량별', '시
// 리스트 헤더
const upHeadList1:TableUpperProps[] = [
{ id: "A", title: "행정구역", upSequnce:1, row:0, colSpan:2 },
- { id: "sido", title: "시도", upName:"upChangeRe", upSequnce:1, row:1 },
- { id: "gugun", title: "시군구", upName:"upChangeRe",upSequnce:2, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "sido", title: "시도", upName:"upChangeRe", upSequnce:1, row:1, widthPercent: 10 },
+ { id: "gugun", title: "시군구", upName:"upChangeRe",upSequnce:2, row:1, widthPercent: 10 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 10 },
{ 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: "classifiedSewerPercent", title: "분류식화율(%)", row:0, rowSpan:2, align:'right' },
+ { id: "fctCpc", title: "시설용량(m³/일)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
+ { id: "spareCapacity", title: "여유용량(m³/일)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
+ { id: "variableLoadPercent", title: "변동부하율(%)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
+ { id: "classifiedSewerPercent", title: "분류식화율(%)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
];
const upHeadList2:TableUpperProps[] = [
{ id: "A", title: "유역", upName:"upChangeRe", upSequnce:1, row:0, colSpan:3 },
- { id: "rvbsn", title: "권역", upName:"upChangeRe", upSequnce:1, row:1},
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe", upSequnce:2, row:1},
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe", upSequnce:3, row:1},
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "rvbsn", title: "권역", upName:"upChangeRe", upSequnce:1, row:1, widthPercent: 8 },
+ { id: "lgbsn", title: "단위유역", upName:"upChangeRe", upSequnce:2, row:1, widthPercent: 8},
+ { id: "mdmbsn", title: "중권역", upName:"upChangeRe", upSequnce:3, row:1, widthPercent: 8},
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 10 },
{ 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: "classifiedSewerPercent", title: "분류식화율(%)", row:0, rowSpan:2, align:'right' },
+ { id: "fctCpc", title: "시설용량(m³/일)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
+ { id: "spareCapacity", title: "여유용량(m³/일)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
+ { id: "variableLoadPercent", title: "변동부하율(%)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
+ { id: "classifiedSewerPercent", title: "분류식화율(%)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
];
const upHeadList3:TableUpperProps[] = [
{ id: "A", title: "유역", upName:"upChangeRe", upSequnce:1, row:0, colSpan:3 },
- { id: "rvbsn", title: "권역", upName:"upChangeRe1", upSequnce:1, row:1},
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe1", upSequnce:2, row:1},
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe1", upSequnce:3, row:1},
- { id: "rgnNm", title: "환경청", row:0, rowSpan:2 },
+ { id: "rvbsn", title: "권역", upName:"upChangeRe1", upSequnce:1, row:1, widthPercent: 5 },
+ { id: "lgbsn", title: "단위유역", upName:"upChangeRe1", upSequnce:2, row:1, widthPercent: 5 },
+ { id: "mdmbsn", title: "중권역", upName:"upChangeRe1", upSequnce:3, row:1, widthPercent: 5},
+ { id: "rgnNm", title: "환경청", row:0, rowSpan:2, widthPercent: 8 },
{ id: "B", title: "행정구역", upName:"upChangeRe", upSequnce:1, row:0, colSpan:2 },
- { id: "sido", title: "시도", upName:"upChangeRe2", upSequnce:1, row:1 },
- { id: "gugun", title: "시군구", upName:"upChangeRe2",upSequnce:2, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "sido", title: "시도", upName:"upChangeRe2", upSequnce:1, row:1, widthPercent: 5 },
+ { id: "gugun", title: "시군구", upName:"upChangeRe2",upSequnce:2, row:1, widthPercent: 5 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 10 },
{ 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: "classifiedSewerPercent", title: "분류식화율(%)", row:0, rowSpan:2, align:'right' },
+ { id: "fctCpc", title: "시설용량(m³/일)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
+ { id: "spareCapacity", title: "여유용량(m³/일)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
+ { id: "variableLoadPercent", title: "변동부하율(%)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
+ { id: "classifiedSewerPercent", title: "분류식화율(%)", row:0, rowSpan:2, align:'right', widthPercent: 8 },
];
const planSewageList:PlanSewageProps[] = [
@@ -96,6 +96,7 @@ const planSewageList:PlanSewageProps[] = [
const fetchPlanSewageList = async (pageNo: number, pageSize: number, searchYear: string, partCd?: string, nameCd?: string, fcltCpct?: string, operationValue?: string, fcltyNm?: string) => {
const tailStr = partCd ? '/'+ partCd + '/' + (nameCd || '0') + '/' + (fcltCpct || '0') + '/' + (operationValue || '0') +'/0'+ (fcltyNm && fcltyNm !== '' ? '/' + fcltyNm : '') : '';
const url = '/prcsFclt/info/plan/' + pageNo + '/' + pageSize + '/' + searchYear + tailStr;
+ console.log(url);
const res = await getFetch('fo', url);
return { data: res.data, count: res.count }
}
diff --git a/apps/fo/app/store/processArea/index.tsx b/apps/fo/app/store/processArea/index.tsx
index ccad3436e..37b4d52f0 100644
--- a/apps/fo/app/store/processArea/index.tsx
+++ b/apps/fo/app/store/processArea/index.tsx
@@ -128,35 +128,35 @@ const ProcessFacilityLabelArray:string[] = ['구분', '시도', '시군구','용
// 리스트 헤더(행정별)
const upHeadList1:TableUpperProps[] = [
- { id: "A", title: "행정구역", colSpan:2, rowSpan:2, row:0},
- { id: "sido", title: "시도", upName:"upChangeRe", row:2 },
- { id: "sigungo", title: "시군구", upName:"upChangeRe", row:2 },
- { id: "swtrmtFcltNm", title: "시설명", rowSpan:3, row:0},
- { id: "location", title: "주소", rowSpan:3, row:0, },
- { 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, 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, 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, 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}
+ { id: "A", title: "행정구역", colSpan:2, rowSpan:2, row:0 },
+ { id: "sido", title: "시도", upName:"upChangeRe", row:2, widthPercent:4 },
+ { id: "sigungo", title: "시군구", upName:"upChangeRe", row:2, widthPercent:4 },
+ { id: "swtrmtFcltNm", title: "시설명", rowSpan:3, row:0, widthPercent: 8 },
+ { id: "location", title: "주소", rowSpan:3, row:0 },
+ { id: "fctCpc", title: "시설용량(m³/일)", align:"right", rowSpan:3, row:0, widthPercent: 5 },
+ { id: "B", title: "시설계획", colSpan:19, row: 0 },
+ { id: "C", title: "증설계획(m³/일)", colSpan:6, row: 1 },
+ { id: "planSwageQntSumDt4", title: "기승인\n4단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "planSwageQntSum", title: "현재", row:2, align:"right", widthPercent: 2.5 },
+ { id: "planSwageQntSumDc1", title: "1단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "planSwageQntSumDc2", title: "2단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "planSwageQntSumDc3", title: "3단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "planSwageQntSumDc4", title: "4단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "D", title: "처리인구(인)", colSpan:6, row:1 },
+ { id: "swtrmtPpltnCntDt4", title: "기승인\n4단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "swtrmtPpltnCnt", title: "현재", row:2, align:"right", widthPercent: 2.5 },
+ { id: "swtrmtPpltnCntDc1", title: "1단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "swtrmtPpltnCntDc2", title: "2단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "swtrmtPpltnCntDc3", title: "3단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "swtrmtPpltnCntDc4", title: "4단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "E", title: "처리구역(km²)", colSpan:7, row:1 },
+ { id: "swtrmtZoneAreaDt4", title: "기승인\n4단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "swtrmtZoneArea", title: "현재", row:2, align:"right", widthPercent: 2.5 },
+ { id: "swtrmtZoneAreaDc1", title: "1단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "swtrmtZoneAreaDc2", title: "2단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "swtrmtZoneAreaDc3", title: "3단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "swtrmtZoneAreaDc4", title: "4단계", row:2, align:"right", widthPercent: 2.5 },
+ { id: "trtDstr", title: "처리구역", row:2 }
];
const processAreaList:ProcessAreaProps[] = [
diff --git a/apps/fo/app/store/processFacility/index.tsx b/apps/fo/app/store/processFacility/index.tsx
index ecb668063..43e7eab53 100644
--- a/apps/fo/app/store/processFacility/index.tsx
+++ b/apps/fo/app/store/processFacility/index.tsx
@@ -162,52 +162,56 @@ const ProcessFacilityLabelArray:string[] = ['구분', '시도', '시군구','용
// 리스트 헤더
const upHeadList1:TableUpperProps[] = [
- { id: "sido", title: "시도", upName:"upChangeRe", upSequnce:1 },
- { id: "gugun", title: "시군구", upName:"upChangeRe",upSequnce:2 },
- { id: "bscFctNm", title: "시설명"},
- { id: "daddr", title: "주소"},
- { id: "fctCpc", title: "시설용량\n(m³/일)", align: 'right'},
- { id: "plInflWqltBod", title: "계획유입수질\n(mg/L)", align:"right"},
- { id: "dsInflWqltBod", title: "설계유입수질\n(mg/L)", align:"right"},
- { id: "trtFrfNm", title: '공법'},
- { id: "rnDt", title: '가동개시일'},
- { id: "cmplDt", title: '준공일' },
- { id: "trstOprEtpNm", title: '관리대행업자'}
+ { id: "A", title: "행정명", colSpan: 2, row: 0, widthPercent: 10 },
+ { id: "sido", title: "시도", upName:"upChangeRe", row: 1, upSequnce:1, widthPercent: 5 },
+ { id: "gugun", title: "시군구", upName:"upChangeRe", row: 1, upSequnce:2, widthPercent: 5 },
+ { id: "bscFctNm", title: "시설명", row: 0, rowSpan: 2, widthPercent: 8 },
+ { id: "daddr", title: "주소", row: 0, rowSpan: 2 },
+ { id: "fctCpc", title: "시설용량\n(m³/일)", row: 0, align: 'right', rowSpan: 2, widthPercent: 5 },
+ { id: "plInflWqltBod", title: "계획유입수질\n(mg/L)", row: 0, align:"right", rowSpan: 2, widthPercent: 5 },
+ { id: "dsInflWqltBod", title: "설계유입수질\n(mg/L)", row: 0, align:"right", rowSpan: 2, widthPercent: 5 },
+ { id: "trtFrfNm", title: '공법', row: 0, rowSpan: 2 },
+ { id: "rnDt", title: '가동개시일', row: 0, rowSpan: 2, widthPercent: 5 },
+ { id: "cmplDt", title: '준공일', row: 0, rowSpan: 2, widthPercent: 5 },
+ { id: "trstOprEtpNm", title: '관리대행업자', row: 0, rowSpan: 2 , widthPercent: 14}
];
// 처리시설 리스트 (유역)
const upHeadList2:TableUpperProps[] = [
- { id: "rvbsn", title: "권역", upName:"upChangeRe", upSequnce:1},
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe", upSequnce:2},
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe", upSequnce:3},
- { id: "bscFctNm", title: "시설명"},
- { id: "daddr", title: "주소"},
- { id: "fctCpc", title: "시설용량\n(m³/일)", align: 'right'},
- { id: "plInflWqltBod", title: "계획유입수질\n(mg/L)", align:'right'},
- { id: "dsInflWqltBod", title: "설계유입수질\n(mg/L)", align:'right'},
- { id: "trtFrfNm", title: '공법'},
- { id: "rnDt", title: '가동개시일'},
- { id: "cmplDt", title: '준공일' },
- { id: "trstOprEtpNm", title: '관리대행업자'}
+ { id: "A", title: "유역", colSpan: 3, row: 0, widthPercent: 15 },
+ { id: "rvbsn", title: "권역", row: 1, widthPercent: 5 },
+ { id: "lgbsn", title: "단위유역", row: 1, widthPercent: 5 },
+ { id: "mdmbsn", title: "중권역", row: 1, widthPercent: 5 },
+ { id: "bscFctNm", title: "시설명", rowSpan: 2,row: 0, widthPercent: 8 },
+ { id: "daddr", title: "주소", rowSpan: 2,row: 0 },
+ { id: "fctCpc", title: "시설용량\n(m³/일)", rowSpan: 2,row: 0, widthPercent: 5, align: 'right'},
+ { id: "plInflWqltBod", title: "계획유입수질\n(mg/L)", rowSpan: 2,row: 0, widthPercent: 6, align:'right'},
+ { id: "dsInflWqltBod", title: "설계유입수질\n(mg/L)", rowSpan: 2,row: 0, widthPercent: 6, align:'right'},
+ { id: "trtFrfNm", title: '공법', rowSpan: 2,row: 0 },
+ { id: "rnDt", title: '가동개시일', rowSpan: 2,row: 0, widthPercent: 5 },
+ { id: "cmplDt", title: '준공일', rowSpan: 2,row: 0, widthPercent: 5 },
+ { id: "trstOprEtpNm", title: '관리대행업자', rowSpan: 2,row: 0, widthPercent: 14 }
];
// 처리시설 리스트 (환경청청)
const upHeadList3:TableUpperProps[] = [
- { id: "rvbsn", title: "권역", upName:"upChangeRe1", upSequnce:1},
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe1", upSequnce:2},
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe1", upSequnce:3},
- { id: "rgnNm", title: "환경청"},
- { id: "sido", title: "시도", upName:"upChangeRe2", upSequnce:1 },
- { id: "gugun", title: "시군구", upName:"upChangeRe2",upSequnce:2 },
- { id: "bscFctNm", title: "시설명"},
- { id: "daddr", title: "주소"},
- { id: "fctCpc", title: "시설용량\n(m³/일)", align: 'right'},
- { id: "plInflWqltBod", title: "계획유입수질\n(mg/L)", align:'right'},
- { id: "dsInflWqltBod", title: "설계유입수질\n(mg/L)", align:'right'},
- { id: "trtFrfNm", title: '공법'},
- { id: "rnDt", title: '가동개시일'},
- { id: "cmplDt", title: '준공일' },
- { id: "trstOprEtpNm", title: '관리대행업자'}
+ { id: "A", title: "유역", colSpan: 3, row: 0, widthPercent: 12 },
+ { id: "rvbsn", title: "권역", row: 1, widthPercent: 4 },
+ { id: "lgbsn", title: "단위유역", row: 1, widthPercent: 4},
+ { id: "mdmbsn", title: "중권역", row: 1, widthPercent: 4 },
+ { id: "rgnNm", title: "환경청", row: 0, rowSpan: 2, widthPercent: 6 },
+ { id: "B", title: "행정명", colSpan: 2, row: 0, widthPercent: 8 },
+ { id: "sido", title: "시도", row: 1, widthPercent: 4 },
+ { id: "gugun", title: "시군구", row: 1, widthPercent: 4 },
+ { id: "bscFctNm", title: "시설명", row: 0, rowSpan: 2, widthPercent: 8 },
+ { id: "daddr", title: "주소", row: 0, rowSpan: 2 },
+ { id: "fctCpc", title: "시설용량\n(m³/일)", row: 0, rowSpan: 2, align: 'right', widthPercent: 5 },
+ { id: "plInflWqltBod", title: "계획유입수질\n(mg/L)", row: 0, rowSpan: 2, align:'right', widthPercent: 5 },
+ { id: "dsInflWqltBod", title: "설계유입수질\n(mg/L)", row: 0, rowSpan: 2, align:'right', widthPercent: 5 },
+ { id: "trtFrfNm", title: '공법', row: 0, rowSpan: 2 },
+ { id: "rnDt", title: '가동개시일', row: 0, rowSpan: 2, widthPercent: 5 },
+ { id: "cmplDt", title: '준공일', row: 0, rowSpan: 2, widthPercent: 5 },
+ { id: "trstOprEtpNm", title: '관리대행업자', row: 0, rowSpan: 2, widthPercent: 14 }
];
const processFacilityList:facilityListProps[] = [
diff --git a/apps/fo/app/store/rdi/index.tsx b/apps/fo/app/store/rdi/index.tsx
index 601a925a0..c22859043 100644
--- a/apps/fo/app/store/rdi/index.tsx
+++ b/apps/fo/app/store/rdi/index.tsx
@@ -101,65 +101,65 @@ export interface ExcelType {
// 리스트 헤더
const upHeadList1:TableUpperProps[] = [
{ id: "A", title: "행정구역", row:0, colSpan:2 },
- { id: "sido", title: "시도", upName:"upChangeRe", upSequnce:1, row:1 },
- { id: "sigungo", title: "시군구", upName:"upChangeRe",upSequnce:2, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "sido", title: "시도", row:1, widthPercent: 6 },
+ { id: "sigungo", title: "시군구", row:1, widthPercent: 6 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 7 },
{ id: "daddr", title: "주소", row:0, rowSpan:2 },
- { id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "chungchunFlow", title: "청천시 유입하수량\n(m³/일)", align:"right", row:0, rowSpan:2 },
+ { id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 7 },
+ { id: "chungchunFlow", title: "청천시 유입하수량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 7 },
{ 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, align:"right" },
+ { id: "summerMinBodValue", title: "3mm 이상 강우일 중\n최저 유입BOD\n(mg/L)", align:"right", row:1, widthPercent: 7 },
+ { id: "inflAmnt", title: "하절기최저유입\nBOD유입유량\n(m³/일)", row:1, align:"right", widthPercent: 7 },
{ id: "C", title: "동절기 운영현황(1~2월)", row:0 },
- { 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" },
- { id: "rainCalInflAmnt", title: "강우시 총 추정유입량\n(m³/일)", row:0, rowSpan:2, align:"right" },
- { id: "properYn", title: "적정여부", row:0, rowSpan:2 },
+ { id: "winterAvgBodLowRainfall", title: "청천시 유입BOD\n(mg/L)", row:1, align:"right", widthPercent: 8 },
+ { id: "rdiiValue", title: "RDII추정", row:0, rowSpan:2, align:"right", widthPercent: 8 },
+ { id: "infoRnDay", title: "RDII추정시\n일강수량\n(mm)", row:0, rowSpan:2, align:"right", widthPercent: 7 },
+ { id: "rainCalInflAmnt", title: "강우시\n총 추정유입량\n(m³/일)", row:0, rowSpan:2, align:"right", widthPercent: 6 },
+ { id: "properYn", title: "적정여부", row:0, rowSpan:2, widthPercent: 6 },
];
const upHeadList2:TableUpperProps[] = [
{ id: "A", title: "유역", row:0, colSpan:3 },
- { id: "rvbsn", title: "권역", upName:"upChangeRe", upSequnce:1, row:1 },
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe", upSequnce:2, row:1 },
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe", upSequnce:3, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "rvbsn", title: "권역", row:1, widthPercent: 5 },
+ { id: "lgbsn", title: "단위유역", row:1, widthPercent: 5 },
+ { id: "mdmbsn", title: "중권역", row:1, widthPercent: 5 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 7 },
{ id: "daddr", title: "주소", row:0, rowSpan:2 },
- { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "chungchunFlow", title: "청천시 유입하수량\n(m³/일)", align:"right", row:0, rowSpan:2 },
+ { id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 7 },
+ { id: "chungchunFlow", title: "청천시 유입하수량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 7 },
{ 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유입유량", row:1, align:"right" },
+ { id: "summerMinBodValue", title: "3mm 이상 강우일 중\n최저 유입BOD\n(mg/L)", align:"right", row:1, widthPercent: 7 },
+ { id: "inflAmnt", title: "하절기최저유입\nBOD유입유량\n(m³/일)", row:1, align:"right", widthPercent: 7 },
{ id: "D", title: "동절기 운영현황(1~2월)", row:0 },
- { 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" },
- { id: "rainCalInflAmnt", title: "강우시 총 추정유입량\n(m³/일)", row:0, rowSpan:2, align:"right" },
- { id: "properYn", title: "적정여부", row:0, rowSpan:2 },
+ { id: "winterAvgBodLowRainfall", title: "청천시 유입BOD\n(mg/L)", row:1, align:"right", widthPercent: 8 },
+ { id: "rdiiValue", title: "RDII추정", row:0, rowSpan:2, align:"right", widthPercent: 7 },
+ { id: "infoRnDay", title: "RDII추정시\n일강수량\n(mm)", row:0, rowSpan:2, align:"right", widthPercent: 7 },
+ { id: "rainCalInflAmnt", title: "강우시\n총 추정유입량\n(m³/일)", row:0, rowSpan:2, align:"right", widthPercent: 6 },
+ { id: "properYn", title: "적정여부", row:0, rowSpan:2, widthPercent: 6 },
];
const upHeadList3:TableUpperProps[] = [
{ id: "A", title: "유역", row:0, colSpan:3 },
- { id: "rvbsn", title: "권역", upName:"upChangeRe1", upSequnce:1, row:1 },
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe1", upSequnce:2, row:1 },
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe1", upSequnce:3, row:1 },
- { id: "rgnNm", title: "환경청", row:0, rowSpan:2 },
+ { id: "rvbsn", title: "권역", row:1, widthPercent: 4 },
+ { id: "lgbsn", title: "단위유역", row:1, widthPercent: 4 },
+ { id: "mdmbsn", title: "중권역", row:1, widthPercent: 4 },
+ { id: "rgnNm", title: "환경청", row:0, rowSpan:2, widthPercent: 6 },
{ id: "B", title: "행정구역", row:0, colSpan:2 },
- { id: "sido", title: "시도", upName:"upChangeRe2", upSequnce:1, row:1 },
- { id: "sigungo", title: "시군구", upName:"upChangeRe2",upSequnce:2, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "sido", title: "시도", upName:"upChangeRe2", upSequnce:1, row:1, widthPercent: 4 },
+ { id: "sigungo", title: "시군구", upName:"upChangeRe2",upSequnce:2, row:1, widthPercent: 4 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 6 },
{ id: "daddr", title: "주소", row:0, rowSpan:2 },
- { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "chungchunFlow", title: "청천시 유입하수량\n(m³/일)", align:"right", row:0, rowSpan:2 },
+ { id: "fctCpc", title: "시설용량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 5 },
+ { id: "chungchunFlow", title: "청천시 유입하수량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 6 },
{ id: "C", title: "하절기 운영현황(6~8월)", row:0, colSpan:2 },
- { id: "summerMinBodValue", title: "3mm 이상 강우일 중 최저 유입BOD\n(mg/L)", align:"right", row:1 },
- { id: "inflAmnt", title: "하절기최저유입BOD유입유량", row:1, align:"right" },
+ { id: "summerMinBodValue", title: "3mm 이상 강우일 중\n최저 유입BOD\n(mg/L)", align:"right", row:1, widthPercent: 6 },
+ { id: "inflAmnt", title: "하절기최저유입\nBOD유입유량\n(m³/일)", row:1, align:"right", widthPercent: 6 },
{ id: "D", title: "동절기 운영현황(1~2월)", row:0 },
- { 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" },
- { id: "rainCalInflAmnt", title: "강우시 총 추정유입량\n(m³/일)", row:0, rowSpan:2, align:"right" },
- { id: "properYn", title: "적정여부", row:0, rowSpan:2 },
+ { id: "winterAvgBodLowRainfall", title: "청천시 유입BOD\n(mg/L)", row:1, align:"right", widthPercent: 8 },
+ { id: "rdiiValue", title: "RDII추정", row:0, rowSpan:2, align:"right", widthPercent: 6 },
+ { id: "infoRnDay", title: "RDII추정시\n일강수량\n(mm)", row:0, rowSpan:2, align:"right", widthPercent: 6 },
+ { id: "rainCalInflAmnt", title: "강우시\n총 추정유입량\n(m³/일)", row:0, rowSpan:2, align:"right", widthPercent: 6 },
+ { id: "properYn", title: "적정여부", row:0, rowSpan:2, widthPercent: 6 },
];
const rdiList:RdiProps[] = [
@@ -336,11 +336,20 @@ export const rdiReducer:(set:SetStateFunction)=>RdiActions=(set: SetStateFunctio
minSummerBod = minSummerBod === 99999999 ? 0 : minSummerBod;
minSummerBodInfl = minSummerBodInfl === 99999999 ? 0 : minSummerBodInfl;
- const winterBodAvg = winterBodSunny / winterCnt;
+ const roundMinSummerBodInfl = Number(roundNumber(minSummerBodInfl, 0).toString().replaceAll(',',''));
+ const roundMinSummerBod = Number(roundNumber(minSummerBod, 1).toString().replaceAll(',',''));
+ const roundWinterBodSunny = Number(roundNumber(winterBodSunny, 1).toString().replaceAll(',',''));
+
+ console.log('bsccd : ', item.bscFctCd);
+ console.log('roundMinSummerBodInfl : ',roundMinSummerBodInfl);
+ console.log('roundMinSummerBod : ',roundMinSummerBod);
+ console.log('roundWinterBodSunny : ',roundWinterBodSunny);
+
+ const winterBodAvg = Number(roundNumber((roundWinterBodSunny / winterCnt), 1).toString().replaceAll(',',''));
// 하절기(6~8월) 중 최저 유입 BOD일때 유입유량 x ((동절기 청천시 유입BOD - 하절기(6~8월) 중 최저 유입BOD) / (동절기 청천시 유입BOD))
- const winMinusSum = winterBodAvg - minSummerBod;
- console.log(item.bscFctCd+' '+minSummerBodInfl+' '+winMinusSum+' ('+winterBodSunny+' '+winterCnt+') '+' '+winterBodSunny)
- const rdiValue = winMinusSum===0 ? 0 : minSummerBodInfl * ((winMinusSum / winterBodAvg ));
+ const winMinusSum = winterBodAvg - roundMinSummerBod;
+
+ const rdiValue = winMinusSum===0 ? 0 : roundMinSummerBodInfl * (winMinusSum / winterBodAvg );
rtnWinterInflBod = winterBodAvg;
rtnSummerBodInfl = minSummerBodInfl;
diff --git a/apps/fo/app/store/sewageOccur/index.tsx b/apps/fo/app/store/sewageOccur/index.tsx
index efc51a5af..e9ae8985b 100644
--- a/apps/fo/app/store/sewageOccur/index.tsx
+++ b/apps/fo/app/store/sewageOccur/index.tsx
@@ -63,50 +63,50 @@ export interface ExcelType {
// 리스트 헤더
const upHeadList1:TableUpperProps[] = [
{ id: "A", title: "행정구역", row:0, colSpan:2 },
- { id: "sidoNm", title: "시도", upName:"upChangeRe", upSequnce:1, row:1 },
- { id: "sggNm", title: "시군구", upName:"upChangeRe",upSequnce:2, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "sidoNm", title: "시도", row:1, widthPercent: 8 },
+ { id: "sggNm", title: "시군구", row:1, widthPercent: 8 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 8 },
{ id: "daddr", title: "주소", row:0, rowSpan:2 },
- { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "waterUsage", title: "물사용량(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "swageChangePercent", title: "오수전환율\n(%)", align:"right", row:0, rowSpan:2 },
- { id: "estimationSewage", title: "오수발생량 추정\n(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "sewageInputYear", title: "연간 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "sewageInputChungchun", title: "청천시 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2 },
+ { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "waterUsage", title: "물사용량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "swageChangePercent", title: "오수전환율\n(%)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "estimationSewage", title: "오수발생량 추정\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "sewageInputYear", title: "연간 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "sewageInputChungchun", title: "청천시 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
];
const upHeadList2:TableUpperProps[] = [
{ id: "A", title: "유역", row:0, colSpan:3 },
- { id: "rvbsn", title: "권역", upName:"upChangeRe", upSequnce:1, row:1 },
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe", upSequnce:2, row:1 },
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe", upSequnce:3, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "rvbsn", title: "권역", row:1, widthPercent: 6 },
+ { id: "lgbsn", title: "단위유역", row:1, widthPercent: 6 },
+ { id: "mdmbsn", title: "중권역", row:1, widthPercent: 6 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 8 },
{ id: "daddr", title: "주소", row:0, rowSpan:2 },
- { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "waterUsage", title: "물사용량(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "swageChangePercent", title: "오수전환율", align:"right", row:0, rowSpan:2 },
- { id: "estimationSewage", title: "오수발생량 추정\n(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "sewageInputYear", title: "연간 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "sewageInputChungchun", title: "청천시 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2 },
+ { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "waterUsage", title: "물사용량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "swageChangePercent", title: "오수전환율", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "estimationSewage", title: "오수발생량 추정\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "sewageInputYear", title: "연간 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "sewageInputChungchun", title: "청천시 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
];
const upHeadList3:TableUpperProps[] = [
{ id: "A", title: "유역", row:0, colSpan:3 },
- { id: "rvbsn", title: "권역", upName:"upChangeRe1", upSequnce:1, row:1 },
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe1", upSequnce:2, row:1 },
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe1", upSequnce:3, row:1 },
- { id: "rgnNm", title: "환경청", row:0, rowSpan:2 },
+ { id: "rvbsn", title: "권역", row:1, widthPercent: 5 },
+ { id: "lgbsn", title: "단위유역", row:1, widthPercent: 5 },
+ { id: "mdmbsn", title: "중권역", row:1, widthPercent: 5 },
+ { id: "rgnNm", title: "환경청", row:0, rowSpan:2, widthPercent: 8 },
{ id: "B", title: "행정구역", row:0, colSpan:2 },
- { id: "sidoNm", title: "시도", upName:"upChangeRe2", upSequnce:1, row:1 },
- { id: "sggNm", title: "시군구", upName:"upChangeRe2",upSequnce:2, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "sidoNm", title: "시도", row:1, widthPercent: 6 },
+ { id: "sggNm", title: "시군구", row:1, widthPercent: 6 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 8 },
{ id: "daddr", title: "주소", row:0, rowSpan:2 },
- { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "waterUsage", title: "물사용량(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "swageChangePercent", title: "오수전환율", align:"right", row:0, rowSpan:2 },
- { id: "estimationSewage", title: "오수발생량 추정\n(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "sewageInputYear", title: "연간 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "sewageInputChungchun", title: "청천시 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2 },
+ { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 6 },
+ { id: "waterUsage", title: "물사용량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 6 },
+ { id: "swageChangePercent", title: "오수전환율", align:"right", row:0, rowSpan:2, widthPercent: 6 },
+ { id: "estimationSewage", title: "오수발생량 추정\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 6 },
+ { id: "sewageInputYear", title: "연간 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 6 },
+ { id: "sewageInputChungchun", title: "청천시 하수유입량\n(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 6 },
];
const upHeadListSewageOccurDetail:TableUpperProps[] = [
diff --git a/apps/fo/app/store/underWaterInput/index.tsx b/apps/fo/app/store/underWaterInput/index.tsx
index 816860469..f6b466492 100644
--- a/apps/fo/app/store/underWaterInput/index.tsx
+++ b/apps/fo/app/store/underWaterInput/index.tsx
@@ -35,53 +35,53 @@ const LabelArray:string[] = ['구분', '시도', '시군구','용량별', '시
// 리스트 헤더
const upHeadList1:TableUpperProps[] = [
{ id: "A", title: "행정구역", row:0, colSpan:2 },
- { id: "sidoNm", title: "시도", upName:"upChangeRe", upSequnce:1, row:1 },
- { id: "sggNm", title: "시군구", upName:"upChangeRe",upSequnce:2, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "sidoNm", title: "시도", row:1, widthPercent: 8 },
+ { id: "sggNm", title: "시군구", row:1, widthPercent: 8 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 8 },
{ id: "daddr", title: "주소", row:0, rowSpan:2 },
- { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "inflAmnt", title: "연평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2 },
+ { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "inflAmnt", title: "연평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 10 },
{ id: "C", title: "지하수 유입량 추정", align:"right", row:0, colSpan:3 },
- { id: "underWaterInputYear", title: "연간\n(m³/일)", align:"right", row:1 },
- { id: "underWaterInputSummer", title: "하절기\n(m³/일)", align:"right", row:1 },
- { id: "underWaterInputWinter", title: "동절기\n(m³/일)", align:"right", row:1 },
- { id: "properYn", title: "적정여부", row:0, rowSpan:2 },
+ { id: "underWaterInputYear", title: "연간\n(m³/일)", align:"right", row:1, widthPercent: 8 },
+ { id: "underWaterInputSummer", title: "하절기\n(m³/일)", align:"right", row:1, widthPercent: 8 },
+ { id: "underWaterInputWinter", title: "동절기\n(m³/일)", align:"right", row:1, widthPercent: 8 },
+ { id: "properYn", title: "적정여부", row:0, rowSpan:2, widthPercent: 8 },
];
const upHeadList2:TableUpperProps[] = [
{ id: "A", title: "유역", row:0, colSpan:3 },
- { id: "rvbsn", title: "권역", upName:"upChangeRe", upSequnce:1, row:1 },
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe", upSequnce:2, row:1 },
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe", upSequnce:3, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "rvbsn", title: "권역", row:1, widthPercent: 5 },
+ { id: "lgbsn", title: "단위유역", row:1, widthPercent: 5 },
+ { id: "mdmbsn", title: "중권역", row:1, widthPercent: 5 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 8 },
{ id: "daddr", title: "주소", row:0, rowSpan:2 },
- { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "inflAmnt", title: "연평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2 },
+ { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 8 },
+ { id: "inflAmnt", title: "연평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 10 },
{ id: "C", title: "지하수 유입량 추정", align:"right", row:0, colSpan:3 },
- { id: "underWaterInputYear", title: "연간\n(m³/일)", align:"right", row:1 },
- { id: "underWaterInputSummer", title: "하절기\n(m³/일)", align:"right", row:1 },
- { id: "underWaterInputWinter", title: "동절기\n(m³/일)", align:"right", row:1 },
- { id: "properYn", title: "적정여부", row:0, rowSpan:2 },
+ { id: "underWaterInputYear", title: "연간\n(m³/일)", align:"right", row:1, widthPercent: 8 },
+ { id: "underWaterInputSummer", title: "하절기\n(m³/일)", align:"right", row:1, widthPercent: 8 },
+ { id: "underWaterInputWinter", title: "동절기\n(m³/일)", align:"right", row:1, widthPercent: 8 },
+ { id: "properYn", title: "적정여부", row:0, rowSpan:2, widthPercent: 8 },
];
const upHeadList3:TableUpperProps[] = [
{ id: "A", title: "유역", row:0, colSpan:3 },
- { id: "rvbsn", title: "권역", upName:"upChangeRe1", upSequnce:1, row:1 },
- { id: "lgbsn", title: "단위유역", upName:"upChangeRe1", upSequnce:2, row:1 },
- { id: "mdmbsn", title: "중권역", upName:"upChangeRe1", upSequnce:3, row:1 },
- { id: "rgnNm", title: "환경청", row:0, rowSpan:2 },
+ { id: "rvbsn", title: "권역", upName:"upChangeRe1", upSequnce:1, row:1, widthPercent: 5 },
+ { id: "lgbsn", title: "단위유역", upName:"upChangeRe1", upSequnce:2, row:1, widthPercent: 5 },
+ { id: "mdmbsn", title: "중권역", upName:"upChangeRe1", upSequnce:3, row:1, widthPercent: 5 },
+ { id: "rgnNm", title: "환경청", row:0, rowSpan:2, widthPercent: 8 },
{ id: "B", title: "행정구역", row:0, colSpan:2 },
- { id: "sidoNm", title: "시도", upName:"upChangeRe2", upSequnce:1, row:1 },
- { id: "sggNm", title: "시군구", upName:"upChangeRe2",upSequnce:2, row:1 },
- { id: "bscFctNm", title: "시설명", row:0, rowSpan:2 },
+ { id: "sidoNm", title: "시도", row:1, widthPercent: 6 },
+ { id: "sggNm", title: "시군구", row:1, widthPercent: 6 },
+ { id: "bscFctNm", title: "시설명", row:0, rowSpan:2, widthPercent: 8 },
{ id: "daddr", title: "주소", row:0, rowSpan:2 },
- { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2 },
- { id: "inflAmnt", title: "연평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2 },
+ { id: "fctCpc", title: "시설용량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 6 },
+ { id: "inflAmnt", title: "연평균유입하수량(m³/일)", align:"right", row:0, rowSpan:2, widthPercent: 10 },
{ id: "C", title: "지하수 유입량 추정", align:"right", row:0, colSpan:3 },
- { id: "underWaterInputYear", title: "연간\n(m³/일)", align:"right", row:1 },
- { id: "underWaterInputSummer", title: "하절기\n(m³/일)", align:"right", row:1 },
- { id: "underWaterInputWinter", title: "동절기\n(m³/일)", align:"right", row:1 },
- { id: "properYn", title: "적정여부", row:0, rowSpan:2 },
+ { id: "underWaterInputYear", title: "연간\n(m³/일)", align:"right", row:1, widthPercent: 6},
+ { id: "underWaterInputSummer", title: "하절기\n(m³/일)", align:"right", row:1, widthPercent: 6 },
+ { id: "underWaterInputWinter", title: "동절기\n(m³/일)", align:"right", row:1, widthPercent: 6 },
+ { id: "properYn", title: "적정여부", row:0, rowSpan:2, widthPercent: 6 },
];
// 모달
@@ -288,6 +288,7 @@ export const underWaterReducer:(set:(fn: (state: UnderWaterType) => UnderWaterTy
const bscFctCd = item.bscFctCd;
const res2 = await getFetch('fo', '/fclt/flow/' + bscFctCd + '/' + searchYear) as ApiResponse;
const calData = CalcRainEffect(res2.data, 'SUNNY');
+
let chungcunSumFlow = 0;
let sumSummerChungcunDay = 0;
diff --git a/packages/common/business_components/src/ui/chart/LineBarChart.tsx b/packages/common/business_components/src/ui/chart/LineBarChart.tsx
index f26cb976c..271629e6a 100644
--- a/packages/common/business_components/src/ui/chart/LineBarChart.tsx
+++ b/packages/common/business_components/src/ui/chart/LineBarChart.tsx
@@ -210,8 +210,8 @@ export default function LineBarchart({
>
value.slice(0,7)} fontSize="8px" fontWeight="bold"/> :
- value.slice(0,7)} className="text-[12px] font-bold" /> :
+ value.slice(0,7)}
/> :
(curPage);
const [idx, setIdx] = useState(index);
@@ -104,6 +109,15 @@ export function UiTable({
}
};
+ const getLeafCols = (list: UiHeadProps[]) => {
+ const maxRow = list?.reduce((max, head) => Math.max(max, head.row || 0), 0);
+ return list
+ .filter(h => h.visible !== false)
+ .filter(h => ((h.row ?? 0) + (h.rowSpan ?? 1) - 1) >= maxRow)
+ ;
+ };
+
+ const leafCols = getLeafCols(headlist);
return (
<>
@@ -122,7 +136,13 @@ export function UiTable({
<>
)}
-
+
+ {widthFixed?
+
+ {leafCols.map(col => (
+ :""}
{children ? children :