Merge branch 'iipbs/sn/dev' into iipbs/dm/dev

This commit is contained in:
2026-03-13 13:45:50 +09:00
10 changed files with 530 additions and 100 deletions
@@ -493,8 +493,8 @@ export const MsSwageMhlCol = [
{ id: 'wdth_len', title: '가로길이(m)' },
{ id: 'vrtc_len', title: '세로길이(m)' },
// { id: 'ang_dir', title: '표고' },
{ id: 'altd_vl', title: '표고(EL.m)' },
{ id: 'dpthl_vl', title: '심도(m)' },
{ id: 'altd_vl', title: '지표고(EL.m)' },
{ id: 'dpthl_vl', title: '맨홀저고(EL.m)' },
// { id: 'inst_mng_no', title: '기관관리번호' }
];
export const MsSwageMhlCol2 = [
@@ -518,8 +518,8 @@ export const MsSwageMhlCol2 = [
{ id: 'wdthLen', title: '가로길이(m)' },
{ id: 'vrtcLen', title: '세로길이(m)' },
// { id: 'angDir', title: '표고' },
{ id: 'altdVl', title: '표고(EL.m)' },
{ id: 'dpthlVl', title: '심도(m)' },
{ id: 'altdVl', title: '지표고(EL.m)' },
{ id: 'dpthlVl', title: '맨홀저고(EL.m)' },
// { id: 'instMngNo', title: '기관관리번호' }
];
export const MsSwageMhlExcelCol = {
@@ -531,8 +531,8 @@ export const MsSwageMhlExcelCol = {
'swageMhlDiamVl': '하수맨홀구경(mm)',
'wdthLen': '가로길이(m)',
'vrtcLen': '세로길이(m)',
'altdVl': '표고(EL.m)',
'dpthlVl': '심도(m)'
'altdVl': '지표고(EL.m)',
'dpthlVl': '맨홀저고(EL.m)'
};
// 하수맨홀 뚜껑재질 코드표
export const MS_SWAGE_MHL_CODES = [
@@ -845,4 +845,4 @@ export const numberFields = [
'mesureIntrvl', 'qltwtrCo', 'rnysnFvlc', 'clarFvlc',
'bizAmt', 'count',
'chmbr_xcnts', 'chmbr_ydnts'
];
];
+3
View File
@@ -171,6 +171,9 @@ const Map = () => {
setIsPlaying={setIsPlaying as any}
targetLayerTypes={WATER_DEPTH_LAYER_TYPES as any}
checkInterval={2500}
defaultZoom={7.5}
defaultLonLat={[127.75, 36]}
/>
</div>
</>
@@ -16,8 +16,8 @@ import { Label } from "@common/components/ui/label";
import { useEffect } from "react";
export const WATER_DEPTH_LAYER_TYPES: string[] = [
'tb_ms_flood_dngr_map',
'tb_ms_sbmrg_dngr_map'
'tb_ms_flood_dngr_map', // 홍수위험지도
'tb_ms_sbmrg_dngr_map' // 침수위험지도
];
interface WaterDepthProps {
@@ -28,7 +28,7 @@ export default function RswtStat() {
const { t } = useTranslation('base');
useEffect(() => {
searchRswtStatList(searchYear, code.cityCd,code.rswtBdstType)
searchRswtStatList(searchYear, code.cityCd, code.rswtBdstType);
}, [searchRswtStatList, code.cityCd])
const excelClick = () => {
@@ -44,12 +44,12 @@ export default function RswtStat() {
"중수도+대체수이용량(m³/년)": item.rswtAltSum,
"중수도이용량(m³/년)": item.rswtrUsqty,
"대체수이용량(m³/년)": item.altUswtrUtztnQnt,
"조경용수": item.lndwtr,
"청소화장실용수": item.cleanToilUswtr,
"농업용수": item.farmUswtr,
"공업용수": item.indstUswtr,
"친수용수": item.hydUswtr,
"기타": item.ithlEtcUswtr,
"조경용수": item.lndwtr, // 이용용도코드 utztn_usg_cd 01
"청소화장실용수": item.cleanToilUswtr, // 이용용도코드 utztn_usg_cd 02
"농업용수": item.farmUswtr, // 이용용도코드 utztn_usg_cd 04
"공업용수": item.indstUswtr, // 이용용도코드 utztn_usg_cd 05
"친수용수": item.hydUswtr, // 이용용도코드 utztn_usg_cd 06
"기타": item.ithlEtcUswtr, // 이용용도코드 utztn_usg_cd 07
"연간운영비(백만원/년)": item.anlOperCst,
};
})
+1 -1
View File
@@ -72,7 +72,7 @@ export const authActionsExport: (set: any, get: any) => authActions = (
return;
}
const infoMe = await getUserInfo();
console.log(infoMe);
//console.log(infoMe);
const isLaeSeCd =
infoMe.laeSeCd.slice(0, 2) === "G3" ? infoMe.laeSeCd.slice(2) : "0";
+2 -2
View File
@@ -402,9 +402,9 @@ export const sewageOutFclttUse = [
// WR011: "pplQulity",
// WR012: "pplLenght",
// WR013: "bdstFilterYn", // 사용 불가 yn만 사용해야함으로 해당코드 사용 안함
// WR014: "rainRswtMng", // 지도점검 등록 시변경
// WR014: "rainRswtMng", // 운영관리코드 (빗물중수운영관리형태) 위탁/자체 지도점검 등록 시변경
// WR015: "rainFcltFlowRate", //지도점검 등록 시변경
// WR016: "dmdUszCd", // 지도점검 등록 시변경
// WR016: "dmdUszCd", // 빗물중수이용용도 친수용수지도점검 등록 시변경
// WR017: "sewageInFcltUse", //하수재이용 장내
// WR018: "sewageOutFclttUse", // 하수재이용 장외
// WR019: "htdPowerMthdCd",
@@ -92,9 +92,9 @@ export default function RainChkgdTable({
return {
...item,
...bud[0],
utztnUsgCdText: codeToText(item.guideDetails[0].utztnUsgCd, 'dmdUszCd'),
utztnUsgCdText: codeToText(item.guideDetails[0]?.utztnUsgCd, 'dmdUszCd'),
oilqMeasMthdText:codeToText(item.oilqMeasMthd, 'rainFcltFlowRate'),
operMngCdText:codeToText(item.operMngCd.trim(), 'rainRswtMng'),
operMngCdText:codeToText(item.operMngCd?.trim(), 'rainRswtMng'),
rainyDetails:rainyDetails,
rowspan: item.rainyDetails?.length,
};