diff --git a/apps/dm/.env.local b/apps/dm/.env.local index df18c9228..592656b61 100644 --- a/apps/dm/.env.local +++ b/apps/dm/.env.local @@ -19,7 +19,7 @@ NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr NEXT_PUBLIC_NGII_PARAM = 04trYP9_xwLAfALjwZ-B8g&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={x}&tilerow={y} NEXT_PUBLIC_GATEWAY_URL=http://con.mind-one.co.kr:11083 # 개발 서버 API # NEXT_PUBLIC_GATEWAY_URL=http://localhost:8883 # 개발 서버 API - +CONTENTS_INTRO = 31 NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do NEXT_PRIVATE_WR_ADDRESS_KEY = devU01TX0FVVEgyMDI1MDgyNTEwMzkwNDExNjEwNTM= diff --git a/apps/dm/.env.mindone b/apps/dm/.env.mindone index 22fb6274c..73e8a388a 100644 --- a/apps/dm/.env.mindone +++ b/apps/dm/.env.mindone @@ -20,7 +20,7 @@ NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service NEXT_PUBLIC_GATEWAY_URL=http://con.mind-one.co.kr:11083 # 개발 서버 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 # 박이정 - +CONTENTS_INTRO = 31 NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do NEXT_PRIVATE_WR_ADDRESS_KEY = devU01TX0FVVEgyMDI1MDgyNTEwMzkwNDExNjEwNTM= diff --git a/apps/dm/.env.production b/apps/dm/.env.production index 587001101..9ce7b404a 100644 --- a/apps/dm/.env.production +++ b/apps/dm/.env.production @@ -18,7 +18,7 @@ NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-was.svc.cluster.local:800 NEXT_PUBLIC_NGII_URL = http://172.29.143.87/poiact NEXT_PUBLIC_NGII_PARAM = BDE2BEF39DAFEC293AB6730150F222AC&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={y}&tilerow={x} NEXT_PUBLIC_GATEWAY_URL = http://apigateway.iipbs-was.svc.cluster.local:8000 - +CONTENTS_INTRO = 31 NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do NEXT_PRIVATE_WR_ADDRESS_KEY = U01TXOFVVEgyMDI1MDgyODE0MTAxNzExNjEyMjA= diff --git a/apps/dm/app/(with-layout)/intro/_components/LawIntroSection.tsx b/apps/dm/app/(with-layout)/intro/_components/LawIntroSection.tsx index e366c38ad..58efdd908 100644 --- a/apps/dm/app/(with-layout)/intro/_components/LawIntroSection.tsx +++ b/apps/dm/app/(with-layout)/intro/_components/LawIntroSection.tsx @@ -1,123 +1,93 @@ "use client"; -import React from "react"; -import Image, { type StaticImageData } from "next/image"; - -import lawPlan from "@/public/images/landing/intro/law_timeline.png"; -import planPerformance from "@/public/images/landing/intro/performance_left.png"; -import domesticChange from "@/public/images/landing/intro/domestic_textbox.png"; -import policyHistory from "@/public/images/landing/intro/policy_timeline.png"; -import lawRelation from "@/public/images/landing/intro/rel_note.png"; -import domesticLinkage from "@/public/images/landing/intro/linkage.png"; - -function SectionTitle({ children }: { children: React.ReactNode }) { - return ( -
- -

{children}

-
- ); -} - -function Hr({ className = "" }: { className?: string }) { - return
; -} - -function ImgCard({ src, alt }: { src: StaticImageData; alt: string }) { - return ( -
- {alt} -
- ); -} - -function SectionShell({ - id, - title, - children, - className = "", -}: { - id: string; - title: string; - children: React.ReactNode; - className?: string; -}) { - return ( -
- {title} -
{children}
-
- ); -} - export default function LawIntroSection() { - const title = "물재이용법"; - - return ( -
-
-

- {title} - + const contentsHtml = ` +
+
+

+ 물재이용법 +

-
- - - +
+
+
+ +

법률 제·개정 및 기본계획 수립

+
+
+ 법률 제·개정 및 기본계획 수립 +
+
-
+
- - - +
+
+ +

제2차 계획 대비 실적 현황

+
+
+ 제2차 계획 대비 실적 현황 +
+
-
+
- - - +
+
+ +

우리나라의 수자원 현황 및 물이용 여건

+
+
+ 우리나라의 수자원 현황 및 물이용 여건 +
+
-
+
- - - +
+
+ +

물 재이용 정책 변화 추이

+
+
+ 물 재이용 정책 변화 추이 +
+
-
+
- - - +
+
+ +

타법령과의 관계 검토

+
+
+ 타법령과의 관계 검토 +
+
-
+
- - - +
+
+ +

주요 국가계획의 정책방향과 연계한 물 재이용 정책 필요

+
+
+ 주요 국가계획의 정책방향과 연계한 물 재이용 정책 필요 +
+
+ `; + + return ( +
); -} \ No newline at end of file +} diff --git a/apps/dm/app/(with-layout)/intro/introSection.tsx b/apps/dm/app/(with-layout)/intro/introSection.tsx new file mode 100644 index 000000000..fd958073e --- /dev/null +++ b/apps/dm/app/(with-layout)/intro/introSection.tsx @@ -0,0 +1,232 @@ +import { ContentsPage } from "@/components/ui/contents"; + +export default function IntroSection() { + // const contentsHtml = ` + //
+ //
+ //

+ // 물재이용법 + //   + //

+ //
+ + //
+ //
+ //
+ //   + //

법률 제·개정 및 기본계획 수립

+ //
+ //
+ // 법률 제·개정 및 기본계획 수립 + //
+ //
+ + //
+ + //
+ //
+ //   + //

제2차 계획 대비 실적 현황

+ //
+ //
+ // 제2차 계획 대비 실적 현황 + //
+ //
+ + //
+ + //
+ //
+ //   + //

우리나라의 수자원 현황 및 물이용 여건

+ //
+ //
+ // 우리나라의 수자원 현황 및 물이용 여건 + //
+ //
+ + //
+ + //
+ //
+ //   + //

물 재이용 정책 변화 추이

+ //
+ //
+ // 물 재이용 정책 변화 추이 + //
+ //
+ + //
+ + //
+ //
+ //   + //

타법령과의 관계 검토

+ //
+ //
+ // 타법령과의 관계 검토 + //
+ //
+ + //
+ + //
+ //
+ //   + //

주요 국가계획의 정책방향과 연계한 물 재이용 정책 필요

+ //
+ //
+ // 주요 국가계획의 정책방향과 연계한 물 재이용 정책 필요 + //
+ //
+ //
+ //
+ + //
+ //
+ //

+ // 빗물이용시설 + //   + //

+ //
+ + //
+ //
+ //
+ //   + //

빗물 재이용 소개

+ //
+ //
+ // 빗물 재이용 소개 + //
+ //
+ + //
+ + //
+ //
+ //   + //

빗물이용시설 설치 관리 법적 의무 대상

+ //
+ //
+ // 빗물이용시설 설치 관리 법적 의무 대상 + //
+ //
+ + //
+ + //
+ //
+ //   + //

빗물이용시설 설계 방안

+ //
+ //
+ // 빗물이용시설 설계 방안 + //
+ //
+ + //
+ + //
+ //
+ //   + //

빗물이용시설 시설기준 및 관리기준

+ //
+ //
+ // 빗물이용시설 시설기준 및 관리기준 + //
+ //
+ //
+ //
+ + //
+ //
+ //

+ // 중수도 + //   + //

+ //
+ + //
+ //
+ //
+ //   + //

중수 재이용 소개

+ //
+ //
+ // 중수 재이용 소개 + //
+ //
+ + //
+ + //
+ //
+ //   + //

중수도 설치 의무 대상

+ //
+ //
+ // 중수도 설치 의무 대상 + //
+ //
+ + //
+ + //
+ //
+ //   + //

중수도 시설기준 및 관리기준

+ //
+ //
+ // 중수도 시설기준 및 관리기준 + //
+ //
+ //
+ //
+ + //
+ //
+ //

+ // 하수처리수 재이용 + //   + //

+ //
+ + //
+ //
+ //
+ //   + //

하수처리수 소개

+ //
+ //
+ // 하수처리수 + //
+ //
+ + //
+ + //
+ //
+ //   + //

하수처리수 재이용시설 의무 대상

+ //
+ //
+ // 하수처리수 재이용시설 의무 대상 + //
+ //
+ //
+ //
+ // `; + + const contsSn = Number(process.env.CONTENTS_INTRO ?? 31); + const menuCd = "24"; + + return ; + // return ( + //
+ // ); +} diff --git a/apps/dm/app/(with-layout)/intro/page.tsx b/apps/dm/app/(with-layout)/intro/page.tsx index 7b643e55d..eb67e7a7e 100644 --- a/apps/dm/app/(with-layout)/intro/page.tsx +++ b/apps/dm/app/(with-layout)/intro/page.tsx @@ -1,10 +1,9 @@ +export const dynamic = "force-dynamic"; + // DM 물 재이용 소개 페이지 import BusinessSubNav, { type BusinessSubNavMenu } from "@/components/BusinessSubNav"; import SubPageHeader from "@/components/SubPageHeader"; -import LawIntroSection from "./_components/LawIntroSection"; -import RainIntroSection from "./_components/RainIntroSection"; -import ReuseWaterIntroSection from "./_components/ReuseWaterIntroSection"; -import TreatedIntroSection from "./_components/TreatedIntroSection"; +import IntroSection from "./introSection"; const menus: BusinessSubNavMenu[] = [ { @@ -76,11 +75,8 @@ export default function IntroPage() { {/* 본문 */}
- - - - +
); -} \ No newline at end of file +} diff --git a/apps/dm/app/contents-page.css b/apps/dm/app/contents-page.css new file mode 100644 index 000000000..ce14baf22 --- /dev/null +++ b/apps/dm/app/contents-page.css @@ -0,0 +1,87 @@ +.contents-page { + color: #0f172a; + font-size: 16px; + line-height: 1.5; +} + +.contents-page .page-title { + display: inline-block; +} + +.contents-page .page-title h2 { + position: relative; + display: inline-block; + padding: 0 0.5rem; + font-size: 28px; + font-weight: 800; + line-height: 1; + letter-spacing: -0.025em; + color: #0f172a; +} + +.contents-page .page-title .title-text { + position: relative; + z-index: 1; +} + +.contents-page .page-title .title-bg { + position: absolute; + left: 0; + bottom: -4px; + z-index: 0; + height: 12px; + width: 100%; + background: linear-gradient(to right, #7dd3fc, #86efac); +} + +.contents-page .sections { + margin-top: 2.5rem; +} + +.contents-page .section { + scroll-margin-top: 120px; +} + +.contents-page .section.first { + margin-top: 2.5rem; +} + +.contents-page .section-title { + display: flex; + align-items: center; + gap: 0.75rem; +} + +.contents-page .section-bar { + height: 20px; + width: 3px; + flex-shrink: 0; + background: #0ea5e9; +} + +.contents-page .section-title h3 { + font-size: 24px; + font-weight: 700; + line-height: 1.2; + color: #171717; +} + +.contents-page .image-wrap { + margin-top: 2rem; + width: 100%; + overflow-x: auto; +} + +.contents-page .image-wrap img { + display: block; + margin: 0 auto; + max-width: none; + height: auto; +} + +.contents-page .divider { + height: 2px; + width: 100%; + margin: 2.75rem 0; + background: rgba(0, 0, 0, 0.1); +} diff --git a/apps/dm/app/globals.css b/apps/dm/app/globals.css index 2fee793a1..d3fa1c6e0 100644 --- a/apps/dm/app/globals.css +++ b/apps/dm/app/globals.css @@ -1,5 +1,6 @@ /* @import "../../../packages/common/components/src/base.css"; */ /* @import "../../../packages/common/components/src/base.css"; */ +@import "./contents-page.css"; @tailwind base; @tailwind components; diff --git a/apps/dm/components/ui/contents/contentsPageClient.tsx b/apps/dm/components/ui/contents/contentsPageClient.tsx index 97c62bb83..6628178ef 100644 --- a/apps/dm/components/ui/contents/contentsPageClient.tsx +++ b/apps/dm/components/ui/contents/contentsPageClient.tsx @@ -1,6 +1,5 @@ "use client"; -import { useEffect, useRef } from "react"; import type { ContentsDetail } from "@/src/entities/content/model/contents-interface"; type ContentsPageClientProps = { @@ -8,28 +7,14 @@ type ContentsPageClientProps = { }; function ContentsPageClient({ initialContent }: ContentsPageClientProps) { - const shadowRootRef = useRef(null); - - useEffect(() => { - if (!shadowRootRef.current || !initialContent?.contsCn) return; - - const shadowRoot = - shadowRootRef.current.shadowRoot ?? - shadowRootRef.current.attachShadow({ mode: "open" }); - shadowRoot.innerHTML = ""; - - const styleElement = document.createElement("style"); - styleElement.textContent = `div { font-size: 16px; line-height: 1.5; }`; - shadowRoot.appendChild(styleElement); - - const contentElement = document.createElement("div"); - contentElement.innerHTML = initialContent.contsCn; - shadowRoot.appendChild(contentElement); - }, [initialContent]); - return ( -
-
+
+
); } diff --git a/apps/dm/public/images/landing/intro/rel_note.png b/apps/dm/public/images/landing/intro/rel_note.png index e5cd629a6..6b26f5248 100644 Binary files a/apps/dm/public/images/landing/intro/rel_note.png and b/apps/dm/public/images/landing/intro/rel_note.png differ diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx index d8f52297c..cc892b6d1 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx @@ -6,6 +6,7 @@ import type { customHtdflBdst } from "@/app/store/ruseFcltMng/fcltReg/htdflReg"; import { formatArchArea, tableData } from "@/components/lib/func/common"; import HtdflRegForm from "@/components/ui/form/fcltReg/htdflReg/htdflRegForm"; import { BdstReg } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal"; +import { DEFAULT_LIST_SIZE } from "@/src/shared/config"; import { ContentsDiv, ScrollArea, @@ -136,12 +137,13 @@ export default function Home() {
-
- +
+ + { @@ -153,11 +155,12 @@ export default function Home() { index={htdfTableIndex} resetPageNo={resetPageNo} > +
- +
-
- - {/* */} {/* 높이 조정 */} +
+ + - {/* */} +
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx index 82344fa1f..45fb636c6 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx @@ -152,9 +152,9 @@ export default function Home() {
-
- - {/* */} +
+ + - {/* */} +
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx index 845ebf0e8..a4fa9b97b 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx @@ -158,8 +158,9 @@ export default function Home() {
-
- +
+ + +
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx index 2fd1c2d55..cbc19a4d9 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx @@ -73,8 +73,18 @@ export default function PbnstSttn() { !isAllAreaUser && laeSeCd?.length === 5 ? laeSeCd : "0"; const getFixedSearchValue = useCallback( (baseValue: ReturnType): ReturnType => { + const cleanedValue = { ...baseValue }; + + // 유역(R) 탭 선택 시, 이전 행정구역 탭에서 선택된 시군구 값이 남아있어 + // 검색 결과가 시군구로 필터링되는 현상을 방지하기 위해 sigunValue를 '0'으로 초기화합니다. + if (cleanedValue.partValue === "R"|| cleanedValue.partValue === "G") { + cleanedValue.sigunValue = "0"; + cleanedValue.sigunText = ""; + } + if (isAllAreaUser) { - return baseValue; + // console.log("isAllAreaUser is true"); + return cleanedValue; } const fixedSidoText = @@ -85,7 +95,7 @@ export default function PbnstSttn() { : ""; return { - ...baseValue, + ...cleanedValue, partValue: "A", sidoValue: fixedSidoValue, sigunValue: fixedSigunValue, @@ -259,7 +269,7 @@ export default function PbnstSttn() { ref={ref} isAdmin={!isAllAreaUser} initSidoValue={fixedSidoValue} - initSigunValue={fixedSigunValue !== "0" ? fixedSigunValue : ""} + initSigunValue={fixedSigunValue !== "0" ? fixedSigunValue : "0"} />
@@ -338,4 +348,3 @@ export default function PbnstSttn() { ); } - diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx index 25ceaee65..9f1901f07 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx @@ -1,5 +1,6 @@ import { getFetchWithCount, postFectch, putFectch, deleteFectch } from "@/components/lib/api"; +import { DEFAULT_LIST_SIZE } from "@/src/shared/config"; import type { TableUpperProps } from "@/app/store/common/type/header"; import { z } from "zod"; import { makeMdfr, makeRstr } from "../bdstReg"; @@ -121,7 +122,7 @@ export const htdflFacStateExport: htdflFacState = { const initFetch = async (code: string) => { - let url = `/drain/facilityList/1/11` + let url = `/drain/facilityList/1/${DEFAULT_LIST_SIZE}` url+=`/${code}` @@ -137,7 +138,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = ( try { const htdflRes = await getFetchWithCount( "wr", - `/drain/facilityList/${pageNation}/11/${code}` + `/drain/facilityList/${pageNation}/${DEFAULT_LIST_SIZE}/${code}` ); return set((state: htdflFacState) => ({ ...state, @@ -181,7 +182,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = ( } const htdflRes = await getFetchWithCount( "wr", - `/drain/facilityList/1/11/${code}` + `/drain/facilityList/1/${DEFAULT_LIST_SIZE}/${code}` ); set((state: htdflFacState) => ({ ...state, @@ -251,7 +252,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = ( }, htdflNmSearch :async(code:string | number, fcltNm:string) =>{ try { - const htdflRes = await getFetchWithCount("wr", `/drain/facilityList/1/11/${code}/${fcltNm}`); + const htdflRes = await getFetchWithCount("wr", `/drain/facilityList/1/${DEFAULT_LIST_SIZE}/${code}/${fcltNm}`); set((state: htdflFacState) => { return { ...state, diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx index 505d18557..6340f1082 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx @@ -6,7 +6,7 @@ import { postFectch, putFectch, } from "@/components/lib/api"; -import { SITE_ID } from "@/src/shared/config"; +import { DEFAULT_LIST_SIZE, SITE_ID } from "@/src/shared/config"; import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList"; import { type customPbnst, @@ -113,7 +113,7 @@ const hasuListFetch = async ( ) => { const checkWrRegListRes = await checkWrRegList(); // 재사용시설에 대한 정보 조회 - let url = `/prcsFclt/ruseInfo/${page ? page : 1}/11/A/${sggOrCity ? sggOrCity : "11"}/0/1/SW`; + let url = `/prcsFclt/ruseInfo/${page ? page : 1}/${DEFAULT_LIST_SIZE}/A/${sggOrCity ? sggOrCity : "11"}/0/1/SW`; const data = checkWrRegListRes.filter((item: string) => item !== ""); if (searchTxt) { diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx index f6a5f520e..ce6da6334 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx @@ -6,6 +6,7 @@ import { postFectch, putFectch, } from "@/components/lib/api"; +import { DEFAULT_LIST_SIZE } from "@/src/shared/config"; import { z } from "zod"; import { makeMdfr, makeRstr } from "../bdstReg"; import { @@ -14,7 +15,7 @@ import { validationMessages, } from "./type"; export const TEST_UUID = "2d4b151d-1828-41e0-91d9-4cd28ea1cc7e"; -export const rainRegSize = 15; +export const rainRegSize = DEFAULT_LIST_SIZE; /** * 밧물이용시설 등록 (스토어) diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx index 3ef1af2e5..816d6ab52 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx @@ -1,6 +1,7 @@ import { deleteFectch, getFetchWithCount, postFectch, putFectch } from "@/components/lib/api"; import { upHeadList, type chgBuilding } from "../rainReg"; +import { DEFAULT_LIST_SIZE } from "@/src/shared/config"; import type { TableUpperProps } from "@/app/store/common/type/header"; import { z } from "zod"; import { makeMdfr, makeRstr } from "../bdstReg"; @@ -14,7 +15,7 @@ import { baseReuseBuildingSchema, chgBuildingSchema, validationMessages } from " * 재이용시설 등록 - 중수도시설 등록 * 중수도시설에서 사용하는 api 및 타입 등을 관리한다. * */ -export const rswtRegSize =15; +export const rswtRegSize = DEFAULT_LIST_SIZE; const rswtrObjSchema = z.object({ bdstRuseFcltSn: z.number().nullish(), orgwtKndCd: z.string({ required_error: validationMessages.requiredSelect("원수 종류") }).min(1, { message: validationMessages.requiredSelect("원수 종류") }), diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx index ee94ada00..48c1e965d 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx @@ -298,6 +298,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( fclts: string[] ) => { try { + console.log(reurnValue); const pbnstSttnRes = await hasuListFetch( page, total, diff --git a/apps/wr/src/shared/config/index.ts b/apps/wr/src/shared/config/index.ts index cd83447d5..04e4f2df5 100644 --- a/apps/wr/src/shared/config/index.ts +++ b/apps/wr/src/shared/config/index.ts @@ -1,2 +1,4 @@ export * from "./api"; export * from "./env"; + +export const DEFAULT_LIST_SIZE = 10; diff --git a/packages/common/business_components/src/ui/search_base_form/index.tsx b/packages/common/business_components/src/ui/search_base_form/index.tsx index e4fef1e1e..43276a457 100644 --- a/packages/common/business_components/src/ui/search_base_form/index.tsx +++ b/packages/common/business_components/src/ui/search_base_form/index.tsx @@ -10,9 +10,9 @@ type SearchBaseType = { rightChildren:React.ReactNode; selectSidoData?: SelectDataType[] | []; selectSigunData?: SelectDataType[] | []; - selectRegionData?: SelectDataType[] | []; - selectUnitWaterShedData?: SelectDataType[] | []; - selectMiddleRegionData?: SelectDataType[] | []; + selectRegionData?: SelectDataType[] | []; // 유역 코드 + selectUnitWaterShedData?: SelectDataType[] | []; // 단위유역 코드 + selectMiddleRegionData?: SelectDataType[] | []; // 중권역 코드 selectEnvPartData?: EnvPartSelectDataType[] | []; queryClick:(returnType:ReturnType) => void; excelName?:string; diff --git a/packages/common/business_components/src/ui/search_form_left/index.tsx b/packages/common/business_components/src/ui/search_form_left/index.tsx index 0b04562b4..664a3cb5c 100644 --- a/packages/common/business_components/src/ui/search_form_left/index.tsx +++ b/packages/common/business_components/src/ui/search_form_left/index.tsx @@ -220,12 +220,12 @@ function SearchFormLeft({ isShowPart = false, children, selectSidoData = [], sel initializeCityDataByEnvPartSido('0'); } else { initializeSigunData('0'); - onSelectValue(selectSigunData[0]?.val || '0', 'sigun'); + //onSelectValue(selectSigunData[0]?.val || '0', 'sigun'); } // 다른 selectbox 전체로 초기화 - onSelectValue(selectSidoData[0]?.val || '0', 'sido'); - onSelectValue(selectSigunData[0]?.val || '0', 'sigun'); + //onSelectValue(selectSidoData[0]?.val || '0', 'sido'); + //onSelectValue(selectSigunData[0]?.val || '0', 'sigun'); break; case 'sido': setSidoValue(val); diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index 414efe5f7..ed05a7f19 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -152,7 +152,7 @@ export function UiTable>({ <> )}
- +
{widthFixed ? {leafCols.map(col => (