diff --git a/src/components/pdf/SurveySaleDownloadPdf.tsx b/src/components/pdf/SurveySaleDownloadPdf.tsx index 0802308..5abf49e 100644 --- a/src/components/pdf/SurveySaleDownloadPdf.tsx +++ b/src/components/pdf/SurveySaleDownloadPdf.tsx @@ -1,8 +1,8 @@ 'use client' -import { useEffect, useRef } from 'react' +import { useEffect, useRef, useState } from 'react' import generatePDF, { Margin, Resolution } from 'react-to-pdf' -import { useParams } from 'next/navigation' +import { useParams, useRouter } from 'next/navigation' import { useSurvey } from '@/hooks/useSurvey' import { radioEtcData, roofMaterial, selectBoxOptions, supplementaryFacilities } from '../survey-sale/detail/RoofForm' @@ -11,13 +11,18 @@ export default function SurveySaleDownloadPdf() { const id = params.id const { surveyDetail, isLoadingSurveyDetail } = useSurvey(Number(id)) - - useEffect(() => { - if (isLoadingSurveyDetail) return - handleDownPdf() - }, [surveyDetail, isLoadingSurveyDetail]) + const [isLoading, setIsLoading] = useState(false) + const router = useRouter() const targetRef = useRef(null) + const isGeneratedRef = useRef(false) + + // useEffect(() => { + // if (isLoadingSurveyDetail || !surveyDetail || isGeneratedRef.current) return + // isGeneratedRef.current = true + // handleDownPdf() + // }, [surveyDetail?.id, isLoadingSurveyDetail]) + const handleDownPdf = () => { const options = { method: 'open' as const, @@ -41,14 +46,30 @@ export default function SurveySaleDownloadPdf() { }, } - generatePDF(targetRef, options) - // generatePDF(targetRef, { filename: 'page.pdf' }) + generatePDF(targetRef, options).then(() => { + router.push(`/survey-sale/${id}`) + }) } return ( <> - {/* */} -
-
+ +
+
HWJ 現地調査シート1/2 diff --git a/src/components/survey-sale/detail/DataTable.tsx b/src/components/survey-sale/detail/DataTable.tsx index d0ca7bf..93d314e 100644 --- a/src/components/survey-sale/detail/DataTable.tsx +++ b/src/components/survey-sale/detail/DataTable.tsx @@ -1,13 +1,14 @@ 'use client' import { useSurvey } from '@/hooks/useSurvey' -import { useParams } from 'next/navigation' +import { useParams, useRouter } from 'next/navigation' import { useEffect } from 'react' import DetailForm from './DetailForm' export default function DataTable() { const params = useParams() const id = params.id + const router = useRouter() useEffect(() => { if (Number.isNaN(Number(id))) { @@ -67,7 +68,7 @@ export default function DataTable() { ダウンロード - diff --git a/src/config/config.local.ts b/src/config/config.local.ts index ac02c97..8fbf68b 100644 --- a/src/config/config.local.ts +++ b/src/config/config.local.ts @@ -1,7 +1,7 @@ import getConfigs from '@/config/config.common' // 환경마다 달라져야 할 변수, 값들을 정의합니다. (여기는 local 환경에 맞는 값을 지정합니다.) -const baseUrl = 'http://localhost:3000' +const baseUrl = 'http://172.30.1.23:3000' const mode = 'local' // 환경마다 달라져야 할 값들을 getConfig 함수에 전달합니다.