diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx index 0e9a40f3b..18dbc7943 100644 --- a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx +++ b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx @@ -91,33 +91,12 @@ export default function Page() { }, [rainChkgdn.isInit, rainChkInit]); useEffect(() => { - // data: any[][]; - // headerNum: number; - // headerRange: string; - // sheetName: string; - // startCol?: string; - if (rswtChkgdn.excelList[0]?.data.length > 1) { - const SheetParameter = [ - { - data: rswtChkgdn.excelList, - headerRange: "A1:AJ1", - headerNum: 1, - sheetName: "중수도_점검결과_이용량현황", - startCol: "A", - }, - { - data: rswtChkgdn.excelList, - headerRange: "A1:BB", - headerNum: 1, - sheetName: "중수도_점검결과_수질", - startCol: "A", - }, - ]; - + if (rswtChkgdn.excelList[0]&&rswtChkgdn.excelList[0]?.data.length > 1) { + excelArrayDownload( "중수도시설 지도점검", "sample_rs_chk.xlsx", - SheetParameter + rswtChkgdn.excelList ); } }, [rswtChkgdn.excelList]); @@ -127,7 +106,8 @@ export default function Page() { rainChkgdn.excelList, "빗물이용시설 지도점검", "sample_rainy.xlsx", - "A1:AN1" + "A1:AN1", + 2 ); }, [rainChkgdn.excelList]); diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx index 8b7c5f91d..eb0010047 100644 --- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx +++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx @@ -1,10 +1,9 @@ import { TEST_UUID, - type TableUpperProps, } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; import type { SelectDataType, - sheetParameter, + SheetParameter, } from "@common/business_components"; import { deleteFectch, @@ -25,6 +24,7 @@ import { import { z } from "zod"; import { ToastFormUi } from "@/components/ui/toast/toastFromUi"; import { type chHeadType } from "../rainChkgdn/headList"; +import type { TableUpperProps } from "@/app/store/common/type/header"; const rswtChkHeadList = rswtChkHeadListExport; const rswtDetailHeadList = rswtDetailHeadListExport; @@ -37,7 +37,7 @@ export type rswtChkgdnState = { rswtDetailHeadList: TableUpperProps[]; rswtHeadNm: chHeadType[]; - excelList: [typeof sheetParameter]; + excelList: SheetParameter[]; rswtChkRes: rswtChkZodType[]; rswtChkPolGuide: rswtChkZodType[]; isInit: boolean; @@ -70,7 +70,7 @@ export const rswtChkgdnStateExport: rswtChkgdnState = { excelList: [{ data: [[]], headerNum: 0, headerRange: "A1:V3", sheetName: "", - startCol: 0 + startCol: '1' }], rswtChkRes: [], rswtChkPolGuide: [], @@ -176,9 +176,6 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = ( try { const chData = await makeMdfrChk(rswtChk); - console.log("chData ", chData); - - console.log("rswtChk ", rswtChk); const res = await putFectch("/reuseChk/reuseWater", chData); if (res.ok) { diff --git a/apps/wr/public/sample_rainy.xlsx b/apps/wr/public/sample_rainy.xlsx index ee4b23edb..73a52d89c 100644 Binary files a/apps/wr/public/sample_rainy.xlsx and b/apps/wr/public/sample_rainy.xlsx differ