diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx index 9c5d8e215..24a74bf72 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx @@ -1,17 +1,14 @@ -import { getFetch, getFetchWithCount, postFectch, putFectch } from "@/components/lib/api"; -import { upHeadList, type chgBuilding } from "../rainReg"; +import { getFetchWithCount, postFectch, putFectch } from "@/components/lib/api"; +import type { TableUpperProps } from "@/app/store/common/type/header"; +import toast from "react-hot-toast"; import { z } from "zod"; import { makeMdfr, makeRstr } from "../bdstReg"; import { - baseReuseBuildingSchema, - chgBuildingSchema, htdflReuseBuildingSchema, - validationMessages, + validationMessages } from "../rainReg/type"; // Import baseReuseBuildingSchema, chgBuildingSchema, validationMessages -import type { TableUpperProps } from "@/app/store/common/type/header"; import { htdTableHeadList } from "./headList"; -import toast from "react-hot-toast"; const hdtflObjSchema = z.object({ htdflFcltPk: z.number().nullish(), @@ -192,6 +189,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = ( })); } catch (errorUpdate) { toast.error("온배수 시설물 수정 오류입니다.."); + console.log(errorUpdate); } }, htdflBdstReg: async (data: customHtdflBdst, code: string | number) => { @@ -216,6 +214,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = ( })); } catch (errorReg) { toast.error("온배수 시설물 등록 오류입니다.."); + console.log(errorReg); } },htdflNmSearch :async(code:string | number, fcltNm:string) =>{ diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx index b0ea5fd37..32ddaea6e 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx @@ -1,8 +1,8 @@ import type { TableUpperProps } from "@/app/store/common/type/header"; -import { getFetch, getFetchWithCount, postFectch, putFectch } from "@/components/lib/api"; -import { number, z } from "zod"; -import { makeMdfr, makeRstr } from "../bdstReg"; +import { getFetchWithCount, postFectch, putFectch } from "@/components/lib/api"; import toast from "react-hot-toast"; +import { z } from "zod"; +import { makeMdfr, makeRstr } from "../bdstReg"; import { baseReuseBuildingSchema, chgBuildingSchema, validationMessages } from "./type"; export const TEST_UUID= '2d4b151d-1828-41e0-91d9-4cd28ea1cc7e' diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx index 99ba724ad..78dadc1c0 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx @@ -1,11 +1,11 @@ -import { getFetch, getFetchWithCount, postFectch, putFectch } from "@/components/lib/api"; -import { upHeadList, type chgBuilding } from "../rainReg"; +import { getFetchWithCount, postFectch, putFectch } from "@/components/lib/api"; +import { upHeadList, type chgBuilding } from "../rainReg"; import type { TableUpperProps } from "@/app/store/common/type/header"; -import { z } from "zod"; -import { baseReuseBuildingSchema, chgBuildingSchema, validationMessages } from "../rainReg/type"; -import { makeMdfr, makeRstr } from "../bdstReg"; import toast from "react-hot-toast"; +import { z } from "zod"; +import { makeMdfr, makeRstr } from "../bdstReg"; +import { baseReuseBuildingSchema, chgBuildingSchema, validationMessages } from "../rainReg/type"; const rswtrObjSchema = z.object({ bdstRuseFcltFk: z.number().nullish(), diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/excel.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/excel.tsx index d39a63680..9e0af4ffa 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/excel.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/excel.tsx @@ -1,4 +1,3 @@ -import type { customPbnst } from "../../fcltReg/pbnstReg/type"; export const excelPbnstSttnParsing = (data: any[]): string[][] => { const excelExportData: string[][] = []; diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx index 725f95ea5..20ffe366a 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx @@ -1,15 +1,15 @@ import type { CommonTableProps, TableUpperProps } from "@/app/store/common/type/header"; -import { any, type z } from "zod"; -import { pbnSttHeadListExport, pbnstSttNodeListExport, ruseDmdHeadListExport, ruseFcltHeadListExport, ruseFcltNodeListExport, ruseGuranteeHeadListExport, rusePplHeadListExport, ruseSplyHeadListExport } from "./headList"; +import type { FcPrfType } from "@/app/store/prfmncReg/pbnstPrfmncReg/type"; import { fetchType, getFetch, postFectch } from "@/components/lib/api"; +import type { ReturnType } from "@common/business_components/ui"; +import moment from "moment"; +import { type z } from "zod"; +import type { customPbnst, pubHasuType } from "../../fcltReg/pbnstReg/type"; import { controlHeadView } from "../rainSttn"; import type { sttnHeadListType } from "../rainSttn/headList"; -import type { customPbnst, pubHasuType } from "../../fcltReg/pbnstReg/type"; import { excelPbnstSttnParsing } from "./excel"; -import type { FcPrfType } from "@/app/store/prfmncReg/pbnstPrfmncReg/type"; -import type { ReturnType } from "@common/business_components/ui"; +import { pbnSttHeadListExport, pbnstSttNodeListExport, ruseDmdHeadListExport, ruseFcltHeadListExport, ruseFcltNodeListExport, ruseGuranteeHeadListExport, rusePplHeadListExport, ruseSplyHeadListExport } from "./headList"; import type { WaterReuseFacility } from "./type"; -import moment from "moment"; const pbnstSttHeadList = pbnSttHeadListExport; const pbnstSttNodeList = pbnstSttNodeListExport; diff --git a/apps/wr/app/store/stats/matStat/headList.tsx b/apps/wr/app/store/stats/matStat/headList.tsx deleted file mode 100644 index 881662774..000000000 --- a/apps/wr/app/store/stats/matStat/headList.tsx +++ /dev/null @@ -1,68 +0,0 @@ -import type { TableUpperProps } from "../../common/type/header"; - -export const matStatHeadListExport :TableUpperProps[]=[ - { - id: "시도", - title: "시도", - row:0, - rowSpan:2 - }, - { - id: "개소", - title: "개소", - row:0, - rowSpan:2 - }, - { - id: "요구수량", - title: "요구수량", - row:0, - rowSpan:2 - }, - - - { - id: "용도", - title: "용도", - row:0, - colSpan:6 - }, - { - id: "조경용수", - title: "조경용수", - row:1, - }, - { - id: "청소화장실용수", - title: "청소화장실용수", - row:1, - }, - { - id: "농업용수", - title: "농업용수", - row:1, - }, - { - id: "공업용수", - title: "공업용수", - row:1, - }, - { - id: "친수용수", - title: "친수용수", - row:1, - }, - { - id: "기타", - title: "기타", - row:1, - }, - { - id: "사업비", - title: "사업비(천원)", - row:0, - rowSpan:2 - }, - - -] \ No newline at end of file diff --git a/apps/wr/app/store/stats/matStat/index.tsx b/apps/wr/app/store/stats/matStat/index.tsx deleted file mode 100644 index 3f2e5813f..000000000 --- a/apps/wr/app/store/stats/matStat/index.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import type { TableUpperProps } from "../../common/type/header"; -import { matStatHeadListExport } from "./headList"; - -type matStatActions = { -} - - -export type matStatState = { - matStat: { - matStatHeadList:TableUpperProps[] - } -} - -export type matStatType = matStatState & matStatActions; - -export const matStatExport: matStatState = { - matStat: { - matStatHeadList:matStatHeadListExport - } -} - -export const matStatActionsExport: (set: any) => matStatActions = ( - set: any -) => { - return { - - } -} \ No newline at end of file diff --git a/apps/wr/app/store/store.tsx b/apps/wr/app/store/store.tsx index 7520f7998..63a4eee13 100644 --- a/apps/wr/app/store/store.tsx +++ b/apps/wr/app/store/store.tsx @@ -11,12 +11,19 @@ import { type comCodeState, type comCodeType, } from "./common/code"; +import { comFcltSearchAction, comFcltStateExport, type comFcltState, type comFcltType } from "./common/searchCode"; import { matDmdActionsExport, matDmdStateExport, type matDmdState, type matDmdType, } from "./matDmd"; +import { coRvwActionsExport, coRvwStateExport, type coRvwState, type coRvwType } from "./matDmd/coMatRvw"; +import { coSttnActionsExport, coSttnStateExport, type coSttnState, type coSttnType } from "./matDmd/coSttn"; // 옮겨야함 +import { drgtActionsExport, drgtStateExport, type drgtState, type drgtType } from "./matDmd/drgtSttn"; +import { ldrmntActionsExport, ldrmntStateExport, type ldrmntState, type ldrmntType } from "./matDmd/ldrmntCoSttn"; +import { ruseCaseActionsExport, ruseCaseStateExport, type ruseCaseState, type ruseCaseType } from "./matDmd/ruseCaseMng"; +import { ruseHstryActionsExport, ruseHstryStateExport, type ruseHstryState, type ruseHstryType } from "./matDmd/ruseRvwHstry"; import { rainChkgdnActionsExport, rainChkgdnStateExport, @@ -29,6 +36,15 @@ import { type rswtChkgdnState, type rswtChkgdnType, } from "./prfmncReg/chkgdnReg/rswrtChkgdn"; +import { pbnstPrfmncActionsExport, pbnstPrfmncStateExport, type pbnstPrfmncState, type pbnstPrfmncType } from "./prfmncReg/pbnstPrfmncReg"; +import { + rainChkSttnActionsExport, + rainChkSttnStateExport, + type rainChkSttnState, + type rainChkSttnType, +} from "./prfmncSttn/chkgdnSttn/rainChkgdnSttn"; +import { rswtChkStateExport, rswtChkSttnActionsExport, type rswtChkSttnState, type rswtChkSttnType } from "./prfmncSttn/chkgdnSttn/rswtChkgdnSttn"; +import { pbnstPrfmncSttnActionsExport, pbnstPrfmncSttnExport, type pbnstPrfmncSttnState, type pbnstPrfmncSttnType } from "./prfmncSttn/pbnstPrfmncSttn"; import { bdstActionsExport, bdstStateExport, @@ -59,6 +75,13 @@ import { type rswtFacState, type rswtFacType, } from "./ruseFcltMng/fcltReg/rswtReg"; +import { + htdflSttnActionsExport, + htdflSttnStateExport, + type htdflSttnState, + type htdflSttnType, +} from "./ruseFcltMng/fcltSttn/htdflSttn"; +import { pbnstSttnActionsExport, pbnstSttnStateExport, type pbnstSttnState, type pbnstSttnType } from "./ruseFcltMng/fcltSttn/pbnstSttn"; import { rainSttnActionsExport, rainSttnStateExport, @@ -71,32 +94,8 @@ import { type rswtSttnState, type rswtSttnType, } from "./ruseFcltMng/fcltSttn/rswtSttn"; -import { - htdflSttnActionsExport, - htdflSttnStateExport, - type htdflSttnState, - type htdflSttnType, -} from "./ruseFcltMng/fcltSttn/htdflSttn"; -import { - rainChkSttnActionsExport, - rainChkSttnStateExport, - type rainChkSttnState, - type rainChkSttnType, -} from "./prfmncSttn/chkgdnSttn/rainChkgdnSttn"; -import { rswtChkStateExport, rswtChkSttnActionsExport, type rswtChkSttnState, type rswtChkSttnType } from "./prfmncSttn/chkgdnSttn/rswtChkgdnSttn"; -import { pbnstSttnActionsExport, pbnstSttnStateExport, type pbnstSttnState, type pbnstSttnType } from "./ruseFcltMng/fcltSttn/pbnstSttn"; -import { coSttnActionsExport, coSttnStateExport, type coSttnState, type coSttnType } from "./matDmd/coSttn"; // 옮겨야함 -import { comFcltStateExport, comFcltSearchAction, type comFcltState, type comFcltType } from "./common/searchCode"; -import { pbnstPrfmncActionsExport, pbnstPrfmncStateExport, type pbnstPrfmncState, type pbnstPrfmncType } from "./prfmncReg/pbnstPrfmncReg"; -import { coRvwActionsExport, coRvwStateExport, type coRvwState, type coRvwType } from "./matDmd/coMatRvw"; -import { ruseHstryActionsExport, ruseHstryStateExport, type ruseHstryState, type ruseHstryType } from "./matDmd/ruseRvwHstry"; -import { pbnstPrfmncSttnActionsExport, pbnstPrfmncSttnExport, type pbnstPrfmncSttnState, type pbnstPrfmncSttnType } from "./prfmncSttn/pbnstPrfmncSttn"; -import { drgtActionsExport, drgtStateExport, type drgtState, type drgtType } from "./matDmd/drgtSttn"; -import { ruseCaseActionsExport, ruseCaseStateExport, type ruseCaseType, type ruseCaseState } from "./matDmd/ruseCaseMng"; import { rainStatActionsExport, rainStatExport, type rainStatState, type rainStatType } from "./stats/rainStat"; -import { type rswtStatType, type rswtStatState, rswtStatExport, rswtStatActionsExport } from "./stats/rswtStat"; -import { matStatActionsExport, matStatExport, type matStatState, type matStatType } from "./stats/matStat"; -import { ldrmntActionsExport, ldrmntStateExport, type ldrmntState, type ldrmntType } from "./matDmd/ldrmntCoSttn"; +import { rswtStatActionsExport, rswtStatExport, type rswtStatState, type rswtStatType } from "./stats/rswtStat"; export type WrStore = comCodeType & pubFacType & @@ -123,7 +122,6 @@ export type WrStore = comCodeType & ruseCaseType& rainStatType& rswtStatType& - matStatType& comFcltType ; @@ -153,8 +151,7 @@ export const StoreZus = ( drgtState& ruseCaseState& rainStatState& - rswtStatState& - matStatState + rswtStatState = { ...comCodeStateExport, ...pubFacStateExport, @@ -181,7 +178,6 @@ export const StoreZus = ( ...ruseCaseStateExport, ...rainStatExport, ...rswtStatExport, - ...matStatExport, ...comFcltStateExport } ) => { @@ -219,8 +215,7 @@ export const StoreZus = ( ...drgtActionsExport(set), ...ruseCaseActionsExport(set), ...rainStatActionsExport(set), - ...rswtStatActionsExport(set), - ...matStatActionsExport(set) + ...rswtStatActionsExport(set) }; }); };