ONAANDALL/frontend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

djlee product

Browse Source
This commit is contained in:
truthwing
2025-07-04 16:12:08 +09:00
parent cec35e6724
commit 011b87784d
9 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead.tsx
+3 -3
View File
@@ -26,10 +26,10 @@ export const headMakeprfmnc = (
key={head.id}
rowSpan={1}
colSpan={
makeHeadNm.find((ch) => ch.headNm === head.upName)?.length
makeHeadNm?.find((ch) => ch.headNm === head.upName)?.length
}
>
{makeHeadNm.find((ch) => ch.headNm === head.upName)?.text}
{makeHeadNm?.find((ch) => ch.headNm === head.upName)?.text}
</TableHead>
) : null
)}
@@ -39,7 +39,7 @@ export const headMakeprfmnc = (
{upHeadList
.filter((data) => data.visible != false)
.map((head: TableUpperProps) =>
makeHeadNm.find((ch) => ch.headNm === head.upName) ? (
makeHeadNm?.find((ch) => ch.headNm === head.upName) ? (
<TableHead
className={`border border-gray-600 px-2 py-1 `}
key={head.id}
apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
+14 -2
View File
@@ -114,10 +114,22 @@ export type splRuseWaterType = {
ruse12: number;
};
export const rainHeadNmExport: chHeadType[] = [
export const rainMainHeadNmExport: chHeadType[] = [
{ headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
{ headNm: "feeHist", text: "과태료 부과내역", length: 3 },
];
export const rainRuseHeadNmExport: chHeadType[] = [
{ headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
{ headNm: "feeHist", text: "과태료 부과내역", length: 3 },
{ headNm: "ruseWater", text: "연간대체수 이용량(m³)", length: 13 },
{ headNm: "detailQulity", text: "분기", length: 11 },
];
export const rainSplHeadNmExport: chHeadType[] = [
{ headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
{ headNm: "feeHist", text: "과태료 부과내역", length: 3 },
{ headNm: "ruseWater", text: "연간보급수 이용량(m³)", length: 13 },
{ headNm: "detailQulity", text: "분기", length: 11 },
{ headNm: "splWater", text: "연간빗물 이용량(m³)", length: 13 },
];
apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
+3 -3
View File
@@ -4,8 +4,8 @@ import { TEST_UUID } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
import {
deleteFectch,
fetchType,
getCountFetch,
getFetch,
getFetchWithCount,
postFectch,
putFectch,
} from "@/components/lib/api";
@@ -133,7 +133,7 @@ const initFetch = async (
) => {
const currentYear = new Date().getFullYear().toString();
const rainRes = await getCountFetch(
const rainRes = await getFetchWithCount(
"wr",
`/reuseChk/rainy` +
(pageNo ? `/${pageNo}` : "/1") +
@@ -235,7 +235,7 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
) => {
try {
const currentYear = new Date().getFullYear();
const rainChkRes = await getCountFetch(
const rainChkRes = await getFetchWithCount(
"wr",
`/reuseChk/rainy` +
(pageNo ? `/${pageNo}` : "/1") +
apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx
+20 -2
View File
@@ -1,6 +1,6 @@
import type { TableUpperProps } from "@/app/store/common/type/header";
import { z } from "zod";
import { guideDetail, type chHeadType } from "../rainChkgdn/headList";
import type { TableUpperProps } from "@/app/store/common/type/header";
export type polutionType = {
chkgdnDtlFk: number;
@@ -109,6 +109,24 @@ export const rswtChkgdZod = z.object({
rswtrPollutions: z.array(rswtrPolutionsZode),
});
export const rswtRuseHeadNmExport: chHeadType[] = [
{ headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
{ headNm: "feeHist", text: "과태료 부과내역", length: 3 },
{ headNm: "ruseWater", text: "연간중수 이용량(m³)", length: 13 },
{ headNm: "detailQulity", text: "분기", length: 11 },
];
export const rswtSplHeadNmExport: chHeadType[] = [
{ headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
{ headNm: "feeHist", text: "과태료 부과내역", length: 3 },
{ headNm: "detailQulity", text: "분기", length: 11 },
{ headNm: "splWater", text: "연간대체수 이용량(m³)", length: 13 },
];
export const rswtHeadNmExport: chHeadType[] = [
{ headNm: "useQuilty", text: "연간 평균 이용수질", length: 10 },
{ headNm: "feeHist", text: "과태료 부과내역", length: 3 },
@@ -126,7 +144,7 @@ export const rswtChkHeadListExport: TableUpperProps[] = [
{ id: "spwtPositn", title: "채수지점" ,mergeCell: true},
{ id: "chckYmd", title: "점검일" ,mergeCell: true},
{ id: "utztnUsgCd", title: "이용용도" },
{ id: "splyUswtrUtztnQnt", title: "연간보급수이용량(m³)" ,type: "number"},
{ id: "splyUswtrUtztnQnt", title: "연간대체수이용량(m³)" ,type: "number"},
{ id: "ruseFcltUtztnQnt", title: "연간중수도이용량(m³)",type: "number"},
{
apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
+3 -3
View File
@@ -6,8 +6,8 @@ import {
import {
deleteFectch,
fetchType,
getCountFetch,
getFetch,
getFetchWithCount,
postFectch,
putFectch,
} from "@/components/lib/api";
@@ -121,7 +121,7 @@ const initFetch = async (
sgg: string | undefined
) => {
const currentYear = new Date().getFullYear().toString();
const rswtChkRes = await getCountFetch(
const rswtChkRes = await getFetchWithCount(
"wr",
`/reuseChk/reuseWater` +
(pageNo ? `/${pageNo}` : "/1") +
@@ -216,7 +216,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
) => {
try {
const currentYear = new Date().getFullYear().toString();
const rswtChkRes = await getCountFetch(
const rswtChkRes = await getFetchWithCount(
"wr",
`/reuseChk/reuseWater` +
(pageNo ? `/${pageNo}` : "/1") +
apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
+3 -5
View File
@@ -1,7 +1,7 @@
import type { TableUpperProps } from "@/app/store/common/type/header";
import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
import { rainMainHeadNmExport, type chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
import { getCountFetch } from "@/components/lib/api";
import { getFetchWithCount } from "@/components/lib/api";
import type { SelectDataType } from "@common/business_components/ui";
import { buildingExcelRainSttn } from "./excel";
import { rainChkgdnHeadSttnExport, ruseSttnHeadListExport, splSttnHeadListExport } from "./headList";
@@ -17,8 +17,6 @@ const ruseHeadList = ruseSttnHeadListExport;
const splHeadList = splSttnHeadListExport;
const rainHeadNm = rainMainHeadNmExport
const rainChk: rainChkZodType[] = [];
export type rainChkSttnState = {
rainChkSttn: {
rainChkRes: rainChkZodType[];
@@ -60,7 +58,7 @@ export const rainChkSttnStateExport: rainChkSttnState = {
const initFetch = async (pageNo: number, cnt: number, txt: string | undefined, sgg: string | undefined) => {
const currentYear = new Date().getFullYear().toString();
const rainRes = await getCountFetch(
const rainRes = await getFetchWithCount(
"wr",
`/reuseChk/rainy` +
(pageNo ? `/${pageNo}` : "/1") +
@@ -100,7 +98,7 @@ export const rainChkSttnActionsExport: (set: any) => rainChkSttnActions = (
) => {
try {
const currentYear = new Date().getFullYear();
const rainChkRes = await getCountFetch(
const rainChkRes = await getFetchWithCount(
"wr",
`/reuseChk/rainy` +
(pageNo ? `/${pageNo}` : "/1") +
apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
+4 -4
View File
@@ -1,10 +1,10 @@
import { rswtHeadNmExport } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList";
import { rswtChkSttnHeadListExport, rswtDetailSttnHeadListExport } from "./headList";
import type { TableUpperProps } from "@/app/store/common/type/header";
import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
import type { rswtChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
import { getFetch } from "@/components/lib/api";
import { rswtHeadNmExport } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList";
import { getFetch, getFetchWithCount } from "@/components/lib/api";
import { buildingExcelRswtSttn } from "./excel";
import { rswtChkSttnHeadListExport, rswtDetailSttnHeadListExport } from "./headList";
const rswtChkHeadList = rswtChkSttnHeadListExport;
const rswtDetailHeadList = rswtDetailSttnHeadListExport;
@@ -113,7 +113,7 @@ export const rswtChkSttnActionsExport: (set: any) => rswtChkSttnActions = (
) => {
try {
const currentYear = new Date().getFullYear().toString();
const rswtChkRes = await getCountFetch(
const rswtChkRes = await getFetchWithCount(
"wr",
`/reuseChk/reuseWater` +
(pageNo ? `/${pageNo}` : "/1") +
apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
+1 -1
View File
@@ -2,7 +2,7 @@
import { headMakeprfmnc } from "@/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead";
import { useWrStore } from "@/app/store";
import type { TableUpperProps } from "@/app/store/common/type/header";
import { type rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
import { rainPageSize, type rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
import { tableData } from "@/components/lib/func/commom";
import {
packages/common/business_components/src/ui/loadingBar/index.tsx
+20
View File
@@ -0,0 +1,20 @@
import { LoadingWithAnimation } from '@common/components/ui/loading';
import React from 'react';
interface LoadingOverlayProps {
isLoading: boolean;
}
const LoadingOverlay: React.FC<LoadingOverlayProps> = ({ isLoading }) => {
if (!isLoading) return null;
return (
<div className="fixed inset-0 flex items-center justify-center bg-black bg-opacity-50 z-50">
<div className="relative w-16 h-16">
<LoadingWithAnimation color="primary" />
</div>
</div>
);
};
export default LoadingOverlay;