diff --git a/apps/wr/app/(popUp-layout)/splyPopup/searchBar/searchBar.tsx b/apps/wr/app/(popUp-layout)/splyPopup/searchBar/searchBar.tsx index ce5c6d1ae..0f5430771 100644 --- a/apps/wr/app/(popUp-layout)/splyPopup/searchBar/searchBar.tsx +++ b/apps/wr/app/(popUp-layout)/splyPopup/searchBar/searchBar.tsx @@ -5,7 +5,7 @@ import { type SelectDataType, } from "@common/business_components/ui"; import { Button, Label } from "@common/components/ui"; -import { useCallback, useEffect, useState } from "react"; +import { useCallback, useState } from "react"; import SearchInputText from "../SearchInputText/SearchInputText"; export function SearchBar({ @@ -15,7 +15,7 @@ export function SearchBar({ setHasuPk: (hasuPk: any) => void; onApply: () => void; }) { - const { map, code, codeInit, findRuseFclt } = useWrStore( + const { map, code, findRuseFclt } = useWrStore( (state) => state ); const [sidoValue, setSidoValue] = useState(""); @@ -24,10 +24,7 @@ export function SearchBar({ { text: "전체", val: "0" }, ]); - useEffect(() => { - //codeInit(); - }, [codeInit]); - + const initializeSigunData = useCallback( (sidoCd: string) => { if (sidoCd === "0") { 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 b85a04d82..a3ed891a8 100644 --- a/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx +++ b/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx @@ -585,7 +585,7 @@ export default function CoMatRvw() { control={form.control} name="ph" render={({ field }) => ( - +
0) { const rainData = tableData(rainRes, { code }).map( (item: customRainBdst) => { - const archArea = - item?.archArea.split(".")[0] !== "-1" - ? item?.archArea.split(".")[0] - : "확인불가"; return { ...item, - archArea: formatCommaNumber(archArea), + archArea: formatArchArea(item?.archArea,1), bdstChgYn: item.chgBuilding[0]?.bdstChgNm != null ? "Y" : "N", + frstArchPrmsnDt:item?.frstArchPrmsnDt||'확인불가' }; } ); @@ -129,7 +126,7 @@ export default function Home() { { @@ -140,9 +137,9 @@ export default function Home() { {/* */}
-
- - +
+ +
- + (""); useEffect(() => { - htdflSttnSearch(false, pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd); + htdflSttnSearch(false, pageNation, htdflSttnSize, String(getConValue()), fcltNm, code.cityCd, code.sggCd); isResetPage(false) }, [pageNation]); @@ -102,7 +103,7 @@ export default function HtdflSttn() { const excelClick = useCallback(() => { isDownloadTriggered.current = true; - htdflSttnSearch(true, 1, String(htdflSttnResCount), String(getConValue()), fcltNm, code.cityCd, code.sggCd); + htdflSttnSearch(true, 1, htdflSttnResCount, String(getConValue()), fcltNm, code.cityCd, code.sggCd); }, [htdflSttnSearch, objSearch, code.cityCd, code.sggCd, fcltNm, htdflSttnResCount]); useEffect(() => { @@ -124,7 +125,7 @@ export default function HtdflSttn() { useEffect(() => { if (!htdflSttn.isInit) { - initHtdfl(false, 1, "20", "0", fcltNm, code.cityCd, code.sggCd); + initHtdfl(false, 1, htdflSttnSize, "0", fcltNm, code.cityCd, code.sggCd); } }, [htdflSttn.isInit, initHtdfl]); @@ -185,7 +186,7 @@ export default function HtdflSttn() {
-
+ {/* */}
diff --git a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx index 0d1b47f4a..5ae5cd264 100644 --- a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx @@ -19,9 +19,9 @@ import { FormUi, SelectBox, } from "@common/business_components/ui"; -import { Button, Input, ScrollArea } from "@common/components/ui"; +import { Button, Input } from "@common/components/ui"; import { zodResolver } from "@hookform/resolvers/zod"; -import { useEffect, useState } from "react"; +import { useEffect } from "react"; import { useForm } from "react-hook-form"; import { z } from "zod"; import BdstAdd from "../bdstReg/bdstAdd"; @@ -46,18 +46,11 @@ export default function RswtrRegForm({ const { code, rswtBdstUpdate, rswtBdstReg } = useWrStore( (state) => state ); - const [divStyle, setDivStyle] = useState("h-[53vh]"); + // const [divStyle, setDivStyle] = useState("h-[53vh]"); useEffect(() => { if(isMap){ - setDivStyle("h-[100vh]") - }else if (isModal === true) { - setDivStyle("h-[53vh] max-h-[37vh]") - } else if (readonly === true) { - setDivStyle("h-[62vh]") - } else { - setDivStyle("h-[57vh]") } - }, [isModal, readonly ,isMap]); + }, [isMap]); // const defaultValues: z.infer = rswtZod.parse({}); const form = useForm>({ @@ -176,7 +169,7 @@ export default function RswtrRegForm({ )}
- + {/* */} {isModal && rswtForm != undefined ? : <>} {isModal ? (

@@ -506,7 +499,7 @@ export default function RswtrRegForm({ - + {/* */} diff --git a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx index d1de75ba1..31f9f2d16 100644 --- a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx +++ b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx @@ -196,7 +196,7 @@ export function BdstReg({
- {/* */} +
{moType === "RNB" ? ( ({ > )}
- {/*
*/} +
); diff --git a/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx b/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx index 80cdb5c4e..b23cad340 100644 --- a/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx +++ b/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx @@ -571,7 +571,7 @@ export default function CoDetailModal({ control={form.control} name="usgRgnArea" render={({ field }) => ( - +