diff --git a/apps/wr/.env.local b/apps/wr/.env.local
index 18cb6fe85..262ffc33e 100644
--- a/apps/wr/.env.local
+++ b/apps/wr/.env.local
@@ -1,14 +1,19 @@
NEXT_PUBLIC_SITE_ID = WR
NEXT_PUBLIC_PORT = 3001
NEXT_PUBLIC_PROXY_HOST = http://localhost:3001
-NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
-NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
-NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver
+NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1
+NEXT_PUBLIC_FO_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1
+NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000
+NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload
NEXT_PUBLIC_CLAIM_NAME = Authorization
NEXT_PUBLIC_AUTH_USER_ID = token-id
NEXT_PUBLIC_ACCESS_TOKEN = access-token
NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
+
+
NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api # 개발 서버 API
# NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.128:8883/sewerage-service/api # 최용성
#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.66:8883/sewerage-service/api # 박이정
+
+
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx
index 84413fbc2..35e2a9d60 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx
@@ -1,3 +1,4 @@
+import { numSize, txtSize } from "@/app/store/common/code/basicCode";
import type { TableUpperProps } from "@/app/store/common/type/header";
import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
@@ -14,8 +15,13 @@ export const pubFacHeadListExport: TableUpperProps[] = [
export const pbnstMngUpHeadListExport: TableUpperProps[] = [
{ id: "choose", title: "선택", type: "checkbox" },
- { id: "operMthd", title: "운영방식",type: "select", selectData: "ruseMngMtd" },
- { id: "rprtvBzenty", title: "대행업체", edit: true ,maxLength:10 },
+ {
+ id: "operMthd",
+ title: "운영방식",
+ type: "select",
+ selectData: "ruseMngMtd",
+ },
+ { id: "rprtvBzenty", title: "대행업체", edit: true, maxLength: 10 },
{
id: "bgngDt",
title: "시작일",
@@ -47,7 +53,7 @@ export const pbnstDemandHeadListExport: TableUpperProps[] = [
export const pbnstOrgwtHeadListRxport: TableUpperProps[] = [
{ id: "ruseUtztnFcltNm", title: "하수처리장명" },
- { id: "orgwtWtritQnt", title: "원수취수량" , type:'number'},
+ { id: "orgwtWtritQnt", title: "원수취수량", type: "number" },
{ id: "tmsYn", title: "하수처리량TMS 전후" },
{ id: "dschgFmYn", title: "하수처리장 방류 유량계 전·후" },
{ id: "dtlPstnExpln", title: "상세위치", edit: true },
@@ -60,7 +66,6 @@ export const fcOrgwtsHeadListExport: TableUpperProps[] = [
{ id: "addr", title: "위치" },
];
-
export const pbnstMngNmExport: chHeadType[] = [
{ headNm: "upChangeRe", text: "운영대행기간", length: 2 },
];
@@ -69,65 +74,91 @@ export type formDetailType = {
id: string;
lable: string;
type?: string;
+ maxLenght?: number;
selectData?: string; // select box일 경우
- option?:string
+ option?: string;
};
export const wasteWaterFcltINfo: formDetailType[] = [
- { id: "wwtEmsnFcltPrmsnYn", lable: "폐수배출물신고 허가여부", type: "select" , selectData: "yn"},
- { id: "tmsInstlYn", lable: "Tms설치여부", type: "select" , selectData: "yn" },
- { id: "pbnstDrngInflwExclYn", lable: "공공하수도유입제외 허가여부", type: "select" , selectData: "yn" },
+ {
+ id: "wwtEmsnFcltPrmsnYn",
+ lable: "폐수배출물신고 허가여부",
+ type: "select",
+ selectData: "yn",
+ },
+ { id: "tmsInstlYn", lable: "Tms설치여부", type: "select", selectData: "yn" },
+ {
+ id: "pbnstDrngInflwExclYn",
+ lable: "공공하수도유입제외 허가여부",
+ type: "select",
+ selectData: "yn",
+ },
];
export const concentratedWaterInfo: formDetailType[] = [
- { id: "erctWtrOcrnCpct", lable: "눙축수 발생량(m³/일)", type: "number" },
- { id: "erctUswtrLinkSpt", lable: "눙축수연계지점" },
- { id: "erctUswtrFcltCpct", lable: "시설용량(m³/일)", type: "number" },
- { id: "erctUswtrPrcsMeth", lable: "눙축수처리방식", type : "select", selectData: "erctUswtrPrcsMeth" },
- { id: "erctUswtrPrcsMsrcCd", lable: "눙축수처리공법" },
+ { id: "erctWtrOcrnCpct", lable: "눙축수 발생량(m³/일)", type: "number",maxLenght:numSize },
+ { id: "erctUswtrLinkSpt", lable: "눙축수연계지점", maxLenght:txtSize },
+ { id: "erctUswtrFcltCpct", lable: "시설용량(m³/일)", type: "number" ,maxLenght:numSize },
+ {
+ id: "erctUswtrPrcsMeth",
+ lable: "눙축수처리방식",
+ type: "select",
+ selectData: "erctUswtrPrcsMeth",
+ },
+ { id: "erctUswtrPrcsMsrcCd", lable: "눙축수처리공법" ,maxLenght:txtSize},
];
export const ruseFcltinfo: formDetailType[] = [
- { id: "rprcsFcltCpct", lable: "시설용량(m³/일)", type: "number" },
- { id: "majorPrcsMsrcCd", lable: "주처리공법" },
- { id: "addr", lable: "위치(주소)" },
- { id: "rprcsMthdCd", lable: "재처리방식", type: "select", selectData: "rusePrcsMthdCd" },
- { id: "inoutYn", lable: "위치(처리장 내외)" ,type: "select" , selectData: "yn"}, // 머가 내? 외?,
- { id: "mainSplyPumpCpct", lable: "메인공급펌프 용량", type: "number" },
+ { id: "rprcsFcltCpct", lable: "시설용량(m³/일)", type: "number", maxLenght:numSize },
+ { id: "majorPrcsMsrcCd", lable: "주처리공법", maxLenght:txtSize },
+ { id: "addr", lable: "위치(주소)", maxLenght:txtSize},
+ {
+ id: "rprcsMthdCd",
+ lable: "재처리방식",
+ type: "select",
+ selectData: "rusePrcsMthdCd",
+
+ },
+ {
+ id: "inoutYn",
+ lable: "위치(처리장 내외)",
+ type: "select",
+ selectData: "yn",
+ }, // 머가 내? 외?,
+ { id: "mainSplyPumpCpct", lable: "메인공급펌프 용량", type: "number" , maxLenght:numSize},
];
export const businessMoneyInfo: formDetailType[] = [
- { id: "gvsbs", lable: "국고", type: "number" },
- { id: "lcep", lable: "지방비", type: "number" },
- { id: "cusrAlotm", lable: "민간투자비", type: "number" },
- { id: "etc", lable: "기타" },
- { id: "totalMoney", lable: "합계", type: "number" ,option:"disabled" },
+ { id: "gvsbs", lable: "국고", type: "number" , maxLenght:numSize},
+ { id: "lcep", lable: "지방비", type: "number" , maxLenght:numSize},
+ { id: "cusrAlotm", lable: "민간투자비", type: "number" , maxLenght:numSize},
+ { id: "etc", lable: "기타" , maxLenght:numSize},
+ { id: "totalMoney", lable: "합계", type: "number", option: "disabled" },
];
export const businessSttnInfo: formDetailType[] = [
- { id: "seCd", lable: "구분", type: "select", selectData: "ruseSeCd" },
- { id: "bizMthdCd", lable: "사업방식", type: "select", selectData: "ruseBizMthdCd" },
+ { id: "seCd", lable: "구분", type: "select", selectData: "ruseSeCd" },
+ {
+ id: "bizMthdCd",
+ lable: "사업방식",
+ type: "select",
+ selectData: "ruseBizMthdCd",
+ },
{ id: "bizCmcnDay", lable: "사업준공일", type: "date" },
{ id: "instlAprvSncnDt", lable: "설치승인인가일", type: "date" },
];
-export const ruseFcltIntakeList: formDetailType[] = [
- { id: "seCd", lable: "구분" },
- { id: "bizMthdCd", lable: "사업방식" },
- { id: "bizCmcnDay", lable: "사업준공일", type: "date" },
- { id: "instlAprvSncnDt", lable: "설치승인인가일", type: "date" },
-];
export const ruseWaterQulityList: formDetailType[] = [
- { id: "bod", lable: "BOD(mg/L)", type: "text" },
- { id: "grssClfg", lable: "총대장균군수(개/mg)", type: "text" },
- { id: "combResdch", lable: "결합잔류염소(mh/L)", type: "text" },
- { id: "trbt", lable: "탁도(NTU)", type: "text" },
- { id: "smll", lable: "냄새", type: "text" },
- { id: "crmty", lable: "색도", type: "text" },
- { id: "tn", lable: "총질소(mg/L)", type: "text" },
- { id: "tph", lable: "총인(mg/L)", type: "text" },
- { id: "ph", lable: "수소이온농도", type: "text" },
- { id: "clIonQnt", lable: "염화물(mg/L)", type: "text" },
- { id: "cdtnv", lable: "전기전도도(μs/cm)", type: "text" },
+ { id: "bod", lable: "BOD(mg/L)", type: "text", maxLenght:numSize },
+ { id: "grssClfg", lable: "총대장균군수(개/mg)", type: "text" , maxLenght:numSize},
+ { id: "combResdch", lable: "결합잔류염소(mh/L)", type: "text" , maxLenght:numSize},
+ { id: "trbt", lable: "탁도(NTU)", type: "text" , maxLenght:numSize},
+ { id: "smll", lable: "냄새", type: "text", maxLenght:numSize },
+ { id: "crmty", lable: "색도", type: "text", maxLenght:numSize },
+ { id: "tn", lable: "총질소(mg/L)", type: "text", maxLenght:numSize },
+ { id: "tph", lable: "총인(mg/L)", type: "text" , maxLenght:numSize},
+ { id: "ph", lable: "수소이온농도", type: "text", maxLenght:numSize},
+ { id: "clIonQnt", lable: "염화물(mg/L)", type: "text", maxLenght:numSize },
+ { id: "cdtnv", lable: "전기전도도(μs/cm)", type: "text", maxLenght:numSize },
];
diff --git a/apps/wr/components/lib/config/index.ts b/apps/wr/components/lib/config/index.ts
index f85f7bad9..376228d4a 100644
--- a/apps/wr/components/lib/config/index.ts
+++ b/apps/wr/components/lib/config/index.ts
@@ -1,17 +1,24 @@
+import {
+ PROXY_HOST,
+ SERVER_API_CS_TUS_URL,
+ SERVER_API_CS_URL,
+ SERVER_API_FO_URL,
+ SERVER_API_URL,
+} from "@/src/shared/config";
-const LOCAL_PORT = "3001";
-const DEV_PORT = "11080";
-const DEV_PORT_NEW="11082"
-
-
-export const LOCAL_URL_WR = `http://localhost:${LOCAL_PORT}/api/v1`;
-export const DEV_URL_WR = `http://con.mind-one.co.kr:${DEV_PORT}/api/v1`;
+//const DEV_PORT = "11080";
+//const DEV_PORT_NEW="11082"
+//export const DEV_URL_WR = `http://con.mind-one.co.kr:${DEV_PORT}/api/v1`;
// export const DEV_URL_WR = `http://192.168.0.91:8880/api/v1`;
-
/// export const DEV_URL_FO = `http://192.168.0.91:8882/api/v1`;
-export const DEV_URL_FO = `http://con.mind-one.co.kr:${DEV_PORT_NEW}/api/v1`;
+//export const DEV_URL_FO = `http://con.mind-one.co.kr:${DEV_PORT_NEW}/api/v1`;
+//export const LOCAL_URL = `http://localhost:${LOCAL_PORT}`;
+//export const CS_URL= 'http://dev.onasys.co.kr:8000'
+//export const CS_TUS_UPLOAD= "/attach-service/api/v1/tus/upload";
-
-export const LOCAL_URL = `http://localhost:${LOCAL_PORT}`;
-export const CS_URL= 'http://dev.onasys.co.kr:8000'
-export const CS_TUS_UPLOAD= "/attach-service/api/v1/tus/upload";
\ No newline at end of file
+export const LOCAL_URL_WR = PROXY_HOST + `/api/v1`;
+export const DEV_URL_WR = SERVER_API_URL;
+export const DEV_URL_FO = SERVER_API_FO_URL;
+export const LOCAL_URL = PROXY_HOST;
+export const CS_URL = SERVER_API_CS_URL;
+export const CS_TUS_UPLOAD = SERVER_API_CS_TUS_URL;
diff --git a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
index 37e6d3a5c..85fdd0c0b 100644
--- a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
@@ -6,7 +6,6 @@ import {
businessSttnInfo,
concentratedWaterInfo,
ruseFcltinfo,
- ruseWaterQulityList,
wasteWaterFcltINfo,
} from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/headList";
import {
@@ -38,6 +37,7 @@ import SdmInsertForm from "@common/business_components/ui/sdmInsertForm";
import type { DemandCompType } from "@common/business_components/ui/sdmInsertForm/form";
import RuseMngTableForm from "@/components/ui/table/pbnstReg/ruseMngTableForm/ruseMngTableForm";
import type { SelectDataType } from "@common/business_components";
+import { BuseWaterQulity } from "./buseWaterQulity/buseWaterQulity";
export function PbnstBuseForm({
indexMng = 0,
@@ -474,7 +474,7 @@ export function PbnstBuseForm({
/>
-