diff --git a/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/publicReuseFaciltyInsert/page.tsx b/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/publicReuseFaciltyInsert/page.tsx
index e5ff07e42..49605f54f 100644
--- a/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/publicReuseFaciltyInsert/page.tsx
+++ b/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/publicReuseFaciltyInsert/page.tsx
@@ -1,11 +1,10 @@
'use client'
-import {ScrollArea, ScrollBar, SearchDiv, SelectBox, UiTable } from '@common/business_components';
-import { Button, TableRow } from '@common/components';
-import { TableHead } from '@common/components';
+import { ScrollArea, SearchDiv, SelectBox, UiTable } from '@common/business_components';
+import { Button, TableHead, TableRow } from '@common/components';
+import { PublicReuseFaciltyFormInsert } from '../../../../components/ui/publicReuseInsertForm';
import { useWrStore } from '../../../store';
import type { TableUpperProps } from '../../../store/publicReuseFaciltyInsert';
-import { PublicReuseFaciltyFormInsert } from '../../../../components/ui/publicReuseInsertForm';
@@ -28,7 +27,8 @@ import { PublicReuseFaciltyFormInsert } from '../../../../components/ui/publicR
export default function PublicReuseFaciltyInsert() {
- const { upHeadList, publicReuseFacilityUper} = useWrStore((state) => state);
+ const {building} = useWrStore((state) => state);
+ const { upHeadList, publicReuseFacilityUper} = building;
const nodeList= headMakeColSpan(upHeadList);
const total = 100;
diff --git a/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/rainReuseFaciltyInsert/page.tsx b/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/rainReuseFaciltyInsert/page.tsx
index dd08c1866..88068f39d 100644
--- a/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/rainReuseFaciltyInsert/page.tsx
+++ b/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/rainReuseFaciltyInsert/page.tsx
@@ -2,62 +2,63 @@
import { useWrStore } from "@/app/store";
import type { TableUpperProps } from "@/app/store/publicReuseFaciltyInsert";
import { RainReuseFaciltyInsertForm } from "@/components/ui/rainReuseInsertForm";
-import { SearchDiv, SelectBox, UiTable } from "@common/business_components";
+import { SearchDiv, SearchInput, UiTable } from "@common/business_components";
import { Button, TableHead, TableRow } from "@common/components";
const headMakeColSpan = (upHeadList: TableUpperProps[]) => {
- return ( <>
+ return (<>
{
- upHeadList.map((head: TableUpperProps) =>
- (!head.upSequnce?{head.title}:
- head.upName === 'upChangeRe'&& head.upSequnce=== 1?{'중축 개축 증축 '}:null))}
+ upHeadList.map((head: TableUpperProps) =>
+ (!head.upSequnce ? {head.title} :
+ head.upName === 'upChangeRe' && head.upSequnce === 1 ? {'중축 개축 증축 '} : null))}
{upHeadList.map((head: TableUpperProps) =>
- (head.upName === 'upChangeRe'?{head.title}:null))}
+ (head.upName === 'upChangeRe' ? {head.title} : null))}
- > )
- }
-
-
-export default function Home (){
- const { building } = useWrStore((state) => state);
- const nodeList= headMakeColSpan(building.upHeadList);
- const total = 100;
-
-
- const selectBox = [{text:'서울', value:'대전'}]
- const headName= ()=>{
- return(
-
○건축물 목록
- )
- }
-
- return(
- <>
- {/*
-
빗물이용시설 등록
-
-
-
-
-
-
- */}
-
-
-
-
- {nodeList}
-
-
-
-
-
-
-
- >
- );
+ >)
+}
+
+
+export default function Home() {
+ const { building } = useWrStore((state) => state);
+ const nodeList = headMakeColSpan(building.upHeadList);
+ const total = 100;
+
+
+ const headName = () => {
+ return (
+ ○건축물 목록
+ )
+ }
+ return (
+ <>
+
+
빗물이용시설 등록
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {nodeList}
+
+
+
+
+
+
+
+ >
+ );
}
-
\ No newline at end of file
diff --git a/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/rswtrReuseFacilityInsert/page.tsx b/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/rswtrReuseFacilityInsert/page.tsx
index 8ed4b61b8..49a79f97b 100644
--- a/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/rswtrReuseFacilityInsert/page.tsx
+++ b/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/rswtrReuseFacilityInsert/page.tsx
@@ -2,62 +2,65 @@
import { useWrStore } from "@/app/store";
import type { TableUpperProps } from "@/app/store/publicReuseFaciltyInsert";
import { RswtrReuseFaciltyInsertForm } from "@/components/ui/rswtrReuseFacilityInsetForm";
-import { SearchDiv, SelectBox, UiTable } from "@common/business_components";
+import { SearchDiv, SearchInput, UiTable } from "@common/business_components";
import { Button, TableHead, TableRow } from "@common/components";
const headMakeColSpan = (upHeadList: TableUpperProps[]) => {
- return ( <>
+ return (<>
{
- upHeadList.map((head: TableUpperProps) =>
- (!head.upSequnce?{head.title}:
- head.upName === 'upChangeRe'&& head.upSequnce=== 1?{'중축 개축 증축 '}:null))}
+ upHeadList.map((head: TableUpperProps) =>
+ (!head.upSequnce ? {head.title} :
+ head.upName === 'upChangeRe' && head.upSequnce === 1 ? {'중축 개축 증축 '} : null))}
{upHeadList.map((head: TableUpperProps) =>
- (head.upName === 'upChangeRe'?{head.title}:null))}
+ (head.upName === 'upChangeRe' ? {head.title} : null))}
- > )
+ >)
+}
+
+
+export default function Home() {
+ const {pubFac} = useWrStore((state) => state);
+ const { upHeadList, publicReuseFacilityUper} = pubFac;
+ const nodeList = headMakeColSpan(upHeadList);
+ const total = 100;
+
+
+ const headName = () => {
+ return (
+ ○건축물 목록
+ )
}
+ return (
+ <>
+
+
빗물이용시설 등록
+
+
+
+
+
+
+
+
+
+
+
+
-export default function Home (){
- const { building } = useWrStore((state) => state);
- const nodeList= headMakeColSpan(building.upHeadList);
- const total = 100;
-
-
- const selectBox = [{text:'서울', value:'대전'}]
- const headName= ()=>{
- return(
-
○건축물 목록
- )
- }
-
- return(
- <>
- {/*
-
빗물이용시설 등록
-
-
-
-
-
-
- */}
-
+
+
+ {nodeList}
+
+
+
+
+
-
-
- {nodeList}
-
-
-
-
-
-
-
- >
- );
+
+ >
+ );
}
-
\ No newline at end of file
diff --git a/apps/wr/app/store/publicReuseFaciltyInsert/index.tsx b/apps/wr/app/store/publicReuseFaciltyInsert/index.tsx
index f4f539a3f..e72612131 100644
--- a/apps/wr/app/store/publicReuseFaciltyInsert/index.tsx
+++ b/apps/wr/app/store/publicReuseFaciltyInsert/index.tsx
@@ -62,32 +62,32 @@ const publicReuseFacilityUper:PublicReuseFacility[] = [
},
]
-export type tableState = {
+export type tableState = {pubFac:{
isInit: boolean;
upHeadList: TableUpperProps[];
publicReuseFacilityUper: PublicReuseFacility[];
-}
+}}
type tableActions = {
decrementList: () => void
}
export type tableType = tableState & tableActions;
-export const tableStateExport:tableState= {
+export const tableStateExport:tableState= {pubFac:{
isInit:false,
upHeadList: upHeadList,
publicReuseFacilityUper: publicReuseFacilityUper,
-}
+}}
export const tableActionsExport:(set:any)=>tableActions=(set: any) => {
return {
decrementList:()=>set(
(state:tableState) => {
return (
- {
- upHeadList: state.upHeadList,
+ {pubFac:{
+ upHeadList: state.pubFac.upHeadList,
publicReuseFacilityUper:
- state.publicReuseFacilityUper.slice(0, state.publicReuseFacilityUper.length - 1)
- })}
+ state.pubFac.publicReuseFacilityUper.slice(0, state.pubFac.publicReuseFacilityUper.length - 1)
+ }})}
)
}
}
diff --git a/apps/wr/tailwind.config.ts b/apps/wr/tailwind.config.ts
index 97b467081..a406f3cef 100644
--- a/apps/wr/tailwind.config.ts
+++ b/apps/wr/tailwind.config.ts
@@ -8,6 +8,7 @@ export default {
content: [
"./app/**/*.{js,ts,jsx,tsx,mdx}",
"../../packages/common/components/src/ui/**/*.{js,ts,jsx,tsx,mdx}",
+ "../../packages/common/business_components/src/ui/**/*.{js,ts,jsx,tsx,mdx}",
],
plugins: [require("tailwindcss-animate")],
theme: {