diff --git a/apps/wr/app/(with-layout)/matMng/coMat/ruseCaseMng/page.tsx b/apps/wr/app/(with-layout)/matMng/coMat/ruseCaseMng/page.tsx index edda29ac6..01b0ccec5 100644 --- a/apps/wr/app/(with-layout)/matMng/coMat/ruseCaseMng/page.tsx +++ b/apps/wr/app/(with-layout)/matMng/coMat/ruseCaseMng/page.tsx @@ -315,6 +315,7 @@ export default function RuseCaseMng() { headName={"물재이용사례 현황"} tableData={ruseCaseMngList} headlist={ruseCaseMng.ruseHeadList} + widthFixed={true} pageSize={20} total={count} cellClick={undefined} diff --git a/apps/wr/app/store/matDmd/ruseCaseMng/headList.tsx b/apps/wr/app/store/matDmd/ruseCaseMng/headList.tsx index 81659ad6d..003b32caa 100644 --- a/apps/wr/app/store/matDmd/ruseCaseMng/headList.tsx +++ b/apps/wr/app/store/matDmd/ruseCaseMng/headList.tsx @@ -2,63 +2,63 @@ import type { SelectDataType } from "@common/business_components/ui"; import type { TableUpperProps } from "../../common/type/header"; export const ruseCaseHeadListExport: TableUpperProps[] = [ - { id: "ruseBizNm", title: "사업명", visible: true, row: 0, rowSpan: 2, }, - { id: "bizBgngDate", title: "사업시작년", visible: true, row: 0, rowSpan: 2, }, - { id: "bizEndDate", title: "사업종료년", visible: true, row: 0, rowSpan: 2, }, + { id: "ruseBizNm", title: "사업명", visible: true, row: 0, rowSpan: 2, widthPercent: 6, }, + { id: "bizBgngDate", title: "사업시작년", visible: true, row: 0, rowSpan: 2, widthPercent: 2, }, + { id: "bizEndDate", title: "사업종료년", visible: true, row: 0, rowSpan: 2, widthPercent: 2, }, { id: "c", title: "공급처", visible: true, row: 0, colSpan: 3, }, - { id: "splyFcltKnd", title: "시설종류", visible: true, row: 1, }, - { id: "splyFcltNm", title: "공급처명", visible: true, row: 1, }, - { id: "splyFcltCpct", title: "시설용량(m³/일)", visible: true, row: 1, }, + { id: "splyFcltKnd", title: "시설종류", visible: true, row: 1, widthPercent: 2, }, + { id: "splyFcltNm", title: "공급처명", visible: true, row: 1, widthPercent: 5, }, + { id: "splyFcltCpct", title: "시설용량\n(m³/일)", visible: true, row: 1, widthPercent: 3, }, { id: "g", title: "수요처", visible: true, row: 0, colSpan: 2, }, - { id: "dmdFcltNm", title: "수요처명", visible: true, row: 1, }, - { id: "dmdFcltAddr", title: "주소", visible: true, row: 1, }, + { id: "dmdFcltNm", title: "수요처명", visible: true, row: 1, widthPercent: 4, }, + { id: "dmdFcltAddr", title: "주소", visible: true, row: 1, widthPercent: 7, }, { id: "q", title: "재이용시설", visible: true, row: 0, colSpan: 5, }, - { id: "ruseFcltCpct", title: "시설용량(m³/일)", visible: true, row: 1, }, - { id: "ruseFcltPplLen", title: "관로(km)", visible: true, row: 1, }, - { id: "ruseFcltUsg", title: "용도", visible: true, row: 1, }, - { id: "ruseFcltSplyCpct", title: "공급량(m³/일)", visible: true, row: 1, }, - { id: "ruseFcltPrcsMsrc", title: "처리공법", visible: true, row: 1, }, + { id: "ruseFcltCpct", title: "시설용량\n(m³/일)", visible: true, row: 1, widthPercent: 1.5, }, + { id: "ruseFcltPplLen", title: "관로(km)", visible: true, row: 1, widthPercent: 1.5, }, + { id: "ruseFcltUsg", title: "용도", visible: true, row: 1, widthPercent: 3, }, + { id: "ruseFcltSplyCpct", title: "공급량\n(m³/일)", visible: true, row: 1, widthPercent: 2, }, + { id: "ruseFcltPrcsMsrc", title: "처리공법", visible: true, row: 1, widthPercent: 3, }, { id: "k", title: "보증수질", visible: true, row: 0, colSpan: 13, }, - { id: "grnteWqUsg", title: "용도별", visible: true, row: 1, }, - { id: "grnteWqGrssClfg", title: "총대장균군수​(개/100ml)", visible: true, row: 1, }, - { id: "grnteWqCombResdch", title: "결합잔류염소(mg/L)", visible: true, row: 1, }, - { id: "grnteWqTrbt", title: "탁도(NTU)", visible: true, row: 1, }, - { id: "grnteWqBod", title: "생물학적​산소요구량(BOD)(mg/L)​", visible: true, row: 1, }, - { id: "grnteWqSmll", title: "냄새​", visible: true, row: 1, }, - { id: "grnteWqCrmty", title: "색도​", visible: true, row: 1, }, - { id: "grnteWqTn", title: "총질소(T-N)(mg/L)​", visible: true, row: 1, }, - { id: "grnteWqTp", title: "총인(T-P)(mg/L)", visible: true, row: 1, }, - { id: "grnteWqPh", title: "수소이온농도(pH)​", visible: true, row: 1, }, - { id: "grnteWqClIonQnt", title: "염화물", visible: true, row: 1, }, - { id: "grnteWqCndctStat", title: "전기전도도​(㎲/cm)", visible: true, row: 1, }, - { id: "grnteWqRmrk", title: "비고​", visible: true, row: 1, }, + { id: "grnteWqUsg", title: "용도별", visible: true, row: 1, widthPercent: 2, }, + { id: "grnteWqGrssClfg", title: "총대장균군수​\n(개/100ml)", visible: true, row: 1, widthPercent: 1.92, }, + { id: "grnteWqCombResdch", title: "결합잔류염소\n(mg/L)", visible: true, row: 1, widthPercent: 1.92, }, + { id: "grnteWqTrbt", title: "탁도(NTU)", visible: true, row: 1, widthPercent: 1.92, }, + { id: "grnteWqBod", title: "생물학적​산소요구량\n(BOD)(mg/L)​", visible: true, row: 1, widthPercent: 1.92, }, + { id: "grnteWqSmll", title: "냄새​", visible: true, row: 1, widthPercent: 1.92, }, + { id: "grnteWqCrmty", title: "색도​", visible: true, row: 1, widthPercent: 1.92, }, + { id: "grnteWqTn", title: "총질소(T-N)(mg/L)​", visible: true, row: 1, widthPercent: 1.92, }, + { id: "grnteWqTp", title: "총인(T-P)(mg/L)", visible: true, row: 1, widthPercent: 1.92, }, + { id: "grnteWqPh", title: "수소이온농도(pH)​", visible: true, row: 1, widthPercent: 1.92, }, + { id: "grnteWqClIonQnt", title: "염화물", visible: true, row: 1, widthPercent: 1.92, }, + { id: "grnteWqCndctStat", title: "전기전도도​(㎲/cm)", visible: true, row: 1, widthPercent: 1.92, }, + { id: "grnteWqRmrk", title: "비고​", visible: true, row: 1, widthPercent: 1.92, }, { id: "h", title: "소요사업비(백만원)", visible: true, row: 0, colSpan: 14, }, - { id: "reqBizGrssCst", title: "총", visible: true, row: 1, }, - { id: "reqBizReuseFcltCst", title: "토목재이용시설", visible: true, row: 1, }, - { id: "reqBizPplCst", title: "토목관로", visible: true, row: 1, }, - { id: "reqBizArchCst", title: "건축", visible: true, row: 1, }, - { id: "reqBizMchnCst", title: "기계", visible: true, row: 1, }, - { id: "reqBizMtrngCst", title: "전기・계측", visible: true, row: 1, }, - { id: "reqBizGisCst", title: "GIS・DB", visible: true, row: 1, }, - { id: "reqBizCctvCst", title: "CCTV", visible: true, row: 1, }, - { id: "reqBizCmcnCst", title: "시공및준공", visible: true, row: 1, }, - { id: "reqBizWstCst", title: "페기물", visible: true, row: 1, }, - { id: "reqBizDesignCst", title: "설계비", visible: true, row: 1, }, - { id: "reqBizSpvsCst", title: "감리비", visible: true, row: 1, }, - { id: "reqBizSbsdCst", title: "시설부대비", visible: true, row: 1, }, - { id: "reqBizEtc", title: "기타", visible: true, row: 1, }, + { id: "reqBizGrssCst", title: "총", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizReuseFcltCst", title: "토목재이용시설", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizPplCst", title: "토목관로", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizArchCst", title: "건축", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizMchnCst", title: "기계", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizMtrngCst", title: "전기・계측", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizGisCst", title: "GIS・DB", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizCctvCst", title: "CCTV", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizCmcnCst", title: "시공및준공", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizWstCst", title: "페기물", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizDesignCst", title: "설계비", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizSpvsCst", title: "감리비", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizSbsdCst", title: "시설부대비", visible: true, row: 1, widthPercent: 1.43, }, + { id: "reqBizEtc", title: "기타", visible: true, row: 1, widthPercent: 1.43, }, { id: "i", title: "자원조달계획(백만원)", visible: true, row: 0, colSpan: 5, }, - { id: "prcmPlanGrssCst", title: "총", visible: true, row: 1, }, - { id: "prcmPlanNlep", title: "국비", visible: true, row: 1, }, - { id: "prcmPlanLcep", title: "지방비", visible: true, row: 1, }, - { id: "prcmPlanBrdnCst", title: "원인자부담", visible: true, row: 1, }, - { id: "prcmPlanEcqrRt", title: "국고비율(%)", visible: true, row: 1, }, + { id: "prcmPlanGrssCst", title: "총", visible: true, row: 1, widthPercent: 1.6, }, + { id: "prcmPlanNlep", title: "국비", visible: true, row: 1, widthPercent: 1.6, }, + { id: "prcmPlanLcep", title: "지방비", visible: true, row: 1, widthPercent: 1.6, }, + { id: "prcmPlanBrdnCst", title: "원인자부담", visible: true, row: 1, widthPercent: 1.6, }, + { id: "prcmPlanEcqrRt", title: "국고비율(%)", visible: true, row: 1, widthPercent: 1.6, }, { id: "j", title: "사업비정산(백만원)", visible: true, row: 0, colSpan: 5, }, - { id: "clclnGrssCst", title: "총", visible: true, row: 1, }, - { id: "clclnNlep", title: "국비", visible: true, row: 1, }, - { id: "clclnLcep", title: "지방비", visible: true, row: 1, }, - { id: "clclnBrdnCst", title: "원인자부담", visible: true, row: 1, }, - { id: "clclnEcqrRt", title: "국고비율(%)", visible: true, row: 1, }, + { id: "clclnGrssCst", title: "총", visible: true, row: 1, widthPercent: 2, }, + { id: "clclnNlep", title: "국비", visible: true, row: 1, widthPercent: 1.5, }, + { id: "clclnLcep", title: "지방비", visible: true, row: 1, widthPercent: 1.5, }, + { id: "clclnBrdnCst", title: "원인자부담", visible: true, row: 1, widthPercent: 1.5, }, + { id: "clclnEcqrRt", title: "국고비율(%)", visible: true, row: 1, widthPercent: 1.5, }, ]; export const ruseUtzType: SelectDataType[] = [ diff --git a/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx b/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx index 1e3253329..c7b1c2c53 100644 --- a/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx +++ b/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx @@ -7,13 +7,13 @@ export const ruseHstryHeadListExport:TableUpperProps[]= [ { id: "dmdCoNm", title: "회사명", visible: true, widthPercent: 10, }, { id: "daddr", title: "주소", visible: true, widthPercent: 16, }, { id: "telno", title: "전화번호", visible: true, widthPercent: 8, }, - { id: "dmndTmng", title: "신청일자", visible: true, widthPercent: 8, }, //바꾸기 - { id: "rvwCmptnYmd", title: "검토일자", visible: true, widthPercent: 8, }, //바꾸기 - { id: "mtchnCmptnYmd", title: "매칭 완료일자", visible: true, widthPercent: 8, }, //바꾸기 + { id: "dmndTmng", title: "신청일자", visible: true, widthPercent: 7, }, //바꾸기 + { id: "rvwCmptnYmd", title: "검토일자", visible: true, widthPercent: 7, }, //바꾸기 + { id: "mtchnCmptnYmd", title: "매칭 완료일자", visible: true, widthPercent: 7, }, //바꾸기 { id: "ruseUtztnFcltNm", title: "공급처", visible: true, widthPercent: 10, }, //바꾸기 - { id: "dmndQty", title: "요구수량(m³/일)", visible: true, widthPercent: 7, }, //바꾸기 + { id: "dmndQty", title: "요구수량\n(m³/일)", visible: true, widthPercent: 6, }, //바꾸기 { id: "useUsgCd", title: "사용용도", visible: true, widthPercent: 5, }, //바꾸기 - { id: "splyFcltFlg", title: "진행상태", visible: true, widthPercent: 3, }, //바꾸기 - { id: "completeYn", title: "매칭완료 여부", visible: true, widthPercent: 3, }, //바꾸기 + { id: "splyFcltFlg", title: "진행상태", visible: true, widthPercent: 5, }, //바꾸기 + { id: "completeYn", title: "매칭완료 여부", visible: true, widthPercent: 5, }, //바꾸기 ]; diff --git a/apps/wr/src/entities/auth/api/login-service.ts b/apps/wr/src/entities/auth/api/login-service.ts index 77d114004..9f2671c76 100644 --- a/apps/wr/src/entities/auth/api/login-service.ts +++ b/apps/wr/src/entities/auth/api/login-service.ts @@ -17,6 +17,7 @@ export class LoginApiService implements LoginService { public async login(payload: ILogin): Promise { try { + tokenManager.clearAuthToken(); const response = await fetch( PROXY_HOST+ ENDPOINT.USER_SERVICE.LOGIN, { method: "POST", body: JSON.stringify({