From 83880cea6d25ea6356eddf8ca925d94e6886058d Mon Sep 17 00:00:00 2001 From: jsyang Date: Mon, 11 Aug 2025 14:04:31 +0900 Subject: [PATCH] =?UTF-8?q?-=20=EC=98=A4=EC=88=98=EB=B0=9C=EC=83=9D?= =?UTF-8?q?=EB=9F=89=20=EC=B6=94=EC=A0=95=20=EA=B8=B0=EA=B0=84=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=EB=AC=B8=EC=A0=9C=ED=95=B4=EA=B2=B0=20-=20geoserve?= =?UTF-8?q?r=20=EC=A3=BC=EC=86=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + apps/fo/.env.development | 3 +- apps/fo/.env.local | 3 +- apps/fo/.env.production | 3 +- .../(with-layout)/sewageOccur/modal/page.tsx | 29 ++++++------------- 5 files changed, 16 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 6b685ea40..945daeeba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # turbo .turbo/ +.vscode/**/* # dependencies node_modules/ diff --git a/apps/fo/.env.development b/apps/fo/.env.development index d362ecf94..de81dde66 100644 --- a/apps/fo/.env.development +++ b/apps/fo/.env.development @@ -5,7 +5,8 @@ NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1 #NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1 NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000 -NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver +#NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver +NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver NEXT_PUBLIC_CLAIM_NAME = Authorization NEXT_PUBLIC_AUTH_USER_ID = token-id diff --git a/apps/fo/.env.local b/apps/fo/.env.local index 4313985b8..2e937af0c 100644 --- a/apps/fo/.env.local +++ b/apps/fo/.env.local @@ -5,7 +5,8 @@ NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1 #NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1 NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000 -NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver +#NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver +NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver NEXT_PUBLIC_CLAIM_NAME = Authorization NEXT_PUBLIC_AUTH_USER_ID = token-id diff --git a/apps/fo/.env.production b/apps/fo/.env.production index aa2cb2c90..797328765 100644 --- a/apps/fo/.env.production +++ b/apps/fo/.env.production @@ -18,7 +18,8 @@ NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1 #NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1 NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000 -NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver +#NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver +NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver NEXT_PUBLIC_CLAIM_NAME = Authorization NEXT_PUBLIC_AUTH_USER_ID = token-id 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 c9c883041..4081b4547 100644 --- a/apps/fo/app/pages/(with-layout)/sewageOccur/modal/page.tsx +++ b/apps/fo/app/pages/(with-layout)/sewageOccur/modal/page.tsx @@ -5,8 +5,6 @@ import { DateMonthPicker, UiTable } from "@common/business_components/ui"; import ListDiv from "@common/business_components/ui/list_div"; import { Table, TableCell, TableHead, TableRow } from "@common/components/ui"; import { useEffect, useState } from "react"; -import { start } from "repl"; - export default function SewageOccurModal(props: { fcltyName: string; facilityCd : string; searchYear : string}) { // 그리드 관련 @@ -19,8 +17,8 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd const [startYearMonth, setStartYearMonth] = useState(validSearchYear+'01'); const [endYearMonth, setEndYearMonth] = useState(validSearchYear+'12'); const [detailList, setDetailList] = useState([]); + // 가능한 시작년월 설정 - const [enableStartMonth, setEnableStartMonth] = useState(['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월']); const [enableEndMonth, setEnableEndMonth] = useState(['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월']); const { @@ -43,13 +41,17 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd useEffect(() => { const standdardMonthList = ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'] - + setEnableEndMonth(standdardMonthList); // 시작년월이 바뀌면 선택가능한 년월 데이터가 변경돼야 한다. if(startYearMonth){ const startMm = startYearMonth.substring(4, 6); + if(endYearMonth < startYearMonth) { + setEndYearMonth(startYearMonth); + } + standdardMonthList.forEach((month) => { - setEnableStartMonth((prev) => { + setEnableEndMonth((prev) => { if (parseInt(month.replaceAll('월', '')) < parseInt(startMm)) { return prev.filter((m) => m !== month); } @@ -57,20 +59,7 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd }); }); } - - if(endYearMonth){ - const endMm = endYearMonth.substring(4, 6); - standdardMonthList.forEach((month) => { - setEnableEndMonth((prev) => { - if (parseInt(month.replaceAll('월', '')) > parseInt(endMm)) { - return prev.filter((m) => m !== month); - } - return prev; - }); - }); - } - - }, [startYearMonth, endYearMonth]); + }, [endYearMonth, startYearMonth]); return ( <> @@ -100,7 +89,7 @@ export default function SewageOccurModal(props: { fcltyName: string; facilityCd selectClass="ml-5 w-[100px]" startYear={1900} yearReadOnly={true} - enableMonth={enableStartMonth} + enableMonth={['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월']} />~