diff --git a/apps/sn/.env.development b/apps/sn/.env.development index fab02e36c..eef7ba4ab 100644 --- a/apps/sn/.env.development +++ b/apps/sn/.env.development @@ -1,12 +1,13 @@ NEXT_PUBLIC_SITE_ID = SN NEXT_PUBLIC_PORT = 11302 NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11302 +NEXT_PUBLIC_ADDR_URL = http://con.mind-one.co.kr:11082 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 #TODO 운영에서 바꿔야 함 +NEXT_PUBLIC_RSONE_DC_URL = https://apigateway.rsonesoft.com #자료관 데이터 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://con.mind-one.co.kr:11083/sewerage-service/api # 개발 서버 API \ No newline at end of file diff --git a/apps/sn/.env.local b/apps/sn/.env.local index 2d8993cb5..8ead81d98 100644 --- a/apps/sn/.env.local +++ b/apps/sn/.env.local @@ -10,7 +10,6 @@ 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 # 최용성 부장님 API -#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.222:8883/sewerage-service/api # 박이정 차장님 API +#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.222:8883/sewerage-service/api # 박이정 차장님 API \ No newline at end of file diff --git a/apps/sn/.env.production b/apps/sn/.env.production index 3e70e36ac..6ae16c15b 100644 --- a/apps/sn/.env.production +++ b/apps/sn/.env.production @@ -6,9 +6,4 @@ 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_GEOSERVER_URL = http://172.29.143.87:8080/geoserver -NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl -NEXT_PUBLIC_SEWERAGE_API_URL= http://apigateway.iipbs-dev.svc.cluster.local:8000/sewerage-service/api -NEXT_PUBLIC_ADDR_URL = http://con.mind-one.co.kr:11082 -NEXT_PUBLIC_RSONE_DC_URL = https://apigateway.rsonesoft.com #자료관 데이터 \ No newline at end of file +NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api # 개발 서버 API diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx index adf85f1af..72e521d33 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx @@ -43,8 +43,8 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => { const chartForm = CHART_FORM.LINE; const chartConfig = { - chartData1: { label: '순오수량(m³/h)', color: "red", }, - chartData2: { label: '실측하수량(m³/h)', color: "orange", } + chartData1: { label: '순오수량', color: "red", }, + chartData2: { label: '실측하수량', color: "orange", } } as ChartConfig; useEffect(() => { @@ -150,7 +150,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => { {/* 상수사용량 적용연월 */}
- 상수사용량 적용연월 + ● 상수사용량 적용연월
{(selectedAplcnYm) ? moment(selectedAplcnYm, "YYYYMM").format("YYYY-MM") : ""} @@ -159,16 +159,17 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
{/* 침입수량 분석결과 */}
- 침입수량 분석결과 + ● 침입수량 산정결과
- {inftwtQty} + 침입수량 : + {inftwtQty} m³/d
{/* 차트 */}
-
@@ -256,7 +257,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => { 닫기 )} @@ -271,7 +272,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => { headerTitle="" bodyClass={` min-h-[50vh] - w-[50vw] + w-[55vw] max-w-none max-h-none overflow-visible diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx index c6792547f..bbf11a3f8 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx @@ -44,7 +44,7 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => { const chartForm = CHART_FORM.LINE; const chartConfig = { - chartData1: { label: 'RDII(m³/h)', color: "red", }, + chartData1: { label: 'RDII', color: "red", }, //chartData2: { label: '순오수량(m³/h)', color: "orange", }, } as ChartConfig; @@ -127,7 +127,7 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => { {/* 상수사용량 적용연월 */}
- 상수사용량 적용연월 + ● 상수사용량 적용연월
{(aplcnYm)? moment(aplcnYm, "YYYYMM").format("YYYY-MM"):""} @@ -137,20 +137,22 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => { {/* 강우유입수량 분석결과 */}
- 강우유입수량 분석결과 + ● 강우유입수량 분석결과
- {rdiiQty} - m³/d + 평균RDII : + {rdiiQty} + m³/d
- {totalVolume} - m³/mm + 강우량대비RDII : + {totalVolume} + m³/mm
{/* 차트 */}
-
@@ -242,7 +244,7 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => { 닫기 )} @@ -257,7 +259,7 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => { headerTitle="" bodyClass={` min-h-[50vh] - w-[50vw] + w-[55vw] max-w-none max-h-none overflow-visible