diff --git a/apps/dm/app/(landing)/reuse/apply/register/page.tsx b/apps/dm/app/(landing)/reuse/apply/register/page.tsx
index 1f376c296..21a5a027f 100644
--- a/apps/dm/app/(landing)/reuse/apply/register/page.tsx
+++ b/apps/dm/app/(landing)/reuse/apply/register/page.tsx
@@ -464,7 +464,7 @@ export default function DemandRegisterPage() {
diff --git a/apps/dm/app/(landing)/reuse/apply/status/page.tsx b/apps/dm/app/(landing)/reuse/apply/status/page.tsx
index 2bc608ff5..2e95c780b 100644
--- a/apps/dm/app/(landing)/reuse/apply/status/page.tsx
+++ b/apps/dm/app/(landing)/reuse/apply/status/page.tsx
@@ -157,7 +157,7 @@ export default function DemandStatusPage() {
if (!selected) return [];
const w = selected.detail.water;
return [
- { label: "총대장균군수(개/100mL)", value: w.coliform },
+ { label: "총대장균군수(개/100㎖)", value: w.coliform },
{ label: "결합잔류염소(mg/L)", value: "-" },
{ label: "탁도(NTU)", value: w.turbidity },
diff --git a/apps/dm/app/(with-layout)/apply/dmdinfo/page.tsx b/apps/dm/app/(with-layout)/apply/dmdinfo/page.tsx
index 25b51a13a..43e89cc30 100644
--- a/apps/dm/app/(with-layout)/apply/dmdinfo/page.tsx
+++ b/apps/dm/app/(with-layout)/apply/dmdinfo/page.tsx
@@ -44,17 +44,17 @@ export default function DemandRegisterPage() {
const [coliform, setColiform] = useState(""); // 총대장균군수
const [noDetect, setNoDetect] = useState(false);
- const [tn, setTn] = useState("");
- const [residualCl, setResidualCl] = useState("");
- const [tp, setTp] = useState("");
- const [turbidity, setTurbidity] = useState("");
- const [ph, setPh] = useState({ min: "", max: "" });
- const [bod, setBod] = useState("");
- const [chloride, setChloride] = useState("");
- const [odor, setOdor] = useState("불쾌하지 않을 것");
- const [ec, setEc] = useState("");
- const [color, setColor] = useState("");
- const [remark, setRemark] = useState("");
+ const [tn, setTn] = useState(""); // 총질소(T-N)
+ const [residualCl, setResidualCl] = useState(""); // 결합잔류염소
+ const [tp, setTp] = useState(""); // 총인(T-P)
+ const [turbidity, setTurbidity] = useState(""); // 탁도
+ const [ph, setPh] = useState({ min: "", max: "" }); // 수소이온농도(pH)
+ const [bod, setBod] = useState(""); // 생물학적산소요구량(BOD)
+ const [chloride, setChloride] = useState(""); // 염화물
+ const [odor, setOdor] = useState("불쾌하지 않을 것"); // 냄새
+ const [ec, setEc] = useState(""); // 전기전도도
+ const [color, setColor] = useState(""); // 색도
+ const [remark, setRemark] = useState(""); // 비고
// 공급처 후보지 선택(필수아님)
const [cand1, setCand1] = useState("");
@@ -373,7 +373,8 @@ export default function DemandRegisterPage() {
switch (value) {
// 청소화장실용도
case '01':
- setTp('0.2');
+ setNoDetect(true); // 총대장균군수 불검출
+ setResidualCl('0.2'); // 잔류염소
setTurbidity('2');
setPh({ min: '5.8', max: '8.5' });
setBod('5');
@@ -381,23 +382,35 @@ export default function DemandRegisterPage() {
break;
// 세척살수용도
case '02':
- setTp('0.2');
- setTurbidity('2');
+ setColiform('1000');
+ setTurbidity('2'); // 탁도
setPh({ min: '5.8', max: '8.5' });
setBod('5');
break;
// 조경용도
case '03':
- setTp('0.2');
+ setColiform('1000');
setTurbidity('2');
setPh({ min: '5.8', max: '8.5' });
setBod('5');
- setChloride('250');
+ setChloride('250'); // 염화물
break;
- // 지하수
+ // 친수용도
+ case '04':
+ setNoDetect(true); // 총대장균군수 불검출
+ setResidualCl('0.1'); // 잔류염소
+ setTurbidity('2');
+ setBod('3');
+ setColor('10');
+ setTn('10'); // 총질소
+ setTp('0.5'); // 총인
+ setPh({ min: '5.8', max: '8.5' });
+ setChloride('0.5');
+ break;
+ // 지하수충전
case '05':
break;
- // 농업용도
+ // 농업용수
case '06':
setTurbidity('5');
setPh({ min: '5.8', max: '8.5' });
@@ -405,16 +418,18 @@ export default function DemandRegisterPage() {
setEc('2000');
setFarmText("이하 (** 간접:2000,직접:700 )");
break;
- // 하천 등 유지보수
+ // 하천 등 유지용수
case '07':
setColiform('1000');
- setTn('10');
+ setBod('5');
+ setTn('20');
setTp('0.5');
setPh({ min: '5.8', max: '8.5' });
- setBod('5');
+ setChloride('0.5');
break;
- // 공업
+ // 공업용수
case '08':
+ setBod('20');
setPh({ min: '5.8', max: '8.5' });
break;
default:
@@ -519,7 +534,7 @@ export default function DemandRegisterPage() {
{/* 1행 */}
diff --git a/apps/dm/app/(with-layout)/apply/status/page.tsx b/apps/dm/app/(with-layout)/apply/status/page.tsx
index 97fe96ead..40241ee4f 100644
--- a/apps/dm/app/(with-layout)/apply/status/page.tsx
+++ b/apps/dm/app/(with-layout)/apply/status/page.tsx
@@ -257,7 +257,7 @@ export default function DemandStatusPage() {
if (!selectedSdmInfoStatus) return [];
return [
- { label: "총대장균군수(개/100mL)", key: "grssClfg", value: formatBelow(selectedSdmInfoStatus.grssClfg) },
+ { label: "총대장균군수(개/100㎖)", key: "grssClfg", value: formatBelow(selectedSdmInfoStatus.grssClfg) },
{ label: "결합잔류염소(mg/L)", key:"combResdch", value: formatBelow(selectedSdmInfoStatus.combResdch) },
{ label: "탁도(NTU)", key:"trbt", value: formatBelow(selectedSdmInfoStatus.trbt) },
diff --git a/apps/dm/components/ui/sdmInfoInsertForm/component.tsx b/apps/dm/components/ui/sdmInfoInsertForm/component.tsx
index ac94e4a02..e66807743 100644
--- a/apps/dm/components/ui/sdmInfoInsertForm/component.tsx
+++ b/apps/dm/components/ui/sdmInfoInsertForm/component.tsx
@@ -411,7 +411,7 @@
// return (
//
//
diff --git a/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx b/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx
index 0cae843bb..f038962da 100644
--- a/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx
+++ b/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx
@@ -503,7 +503,7 @@ export default function CoMatRvw() {
control={form.control}
name="grssClfg"
render={({ field }) => (
-
+