qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[1014] : [819の追加　レイアウト指定配置の自動配置]

Browse Source 
[작업내용] : 문구 수정 및 alert icon 정리
This commit is contained in:
yjnoh 2025-05-07 16:56:28 +09:00
parent 3a66920104
commit f3b8ee40fa
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/hooks/module/useModuleBasicSetting.js
View File

@ -89,12 +89,12 @@ export function useModuleBasicSetting(tabNum) {
//roofIndex 넣기
const roofConstructionArray = roofConstructions.map((detail) => ({ ...detail.trestleDetail, roofIndex: detail.roofIndex }))
setTrestleDetailList(roofConstructionArray)
//북면 설치 가능 판매점
if (moduleSelectionData.common.saleStoreNorthFlg == '1') {
setSaleStoreNorthFlg(true)
}
setTrestleDetailList(roofConstructionArray)
}
} else {
//육지붕 일경우에는 바로 배치면 설치LL
@ -865,10 +865,10 @@ export function useModuleBasicSetting(tabNum) {
// getModuleStatistics()
} else {
swalFire({ text: getMessage('module.place.overlab') })
swalFire({ text: getMessage('module.place.overlab'), icon: 'warning' })
}
} else {
swalFire({ text: getMessage('module.place.out') })
swalFire({ text: getMessage('module.place.out'), icon: 'warning' })
}
}
})
@ -1266,7 +1266,7 @@ export function useModuleBasicSetting(tabNum) {
const mixAsgYn = trestlePolygon.modules[0].moduleInfo.mixAsgYn
//현재 체크된 모듈기준으로 혼합가능인지 확인 Y === Y, N === N 일때만 설치 가능
if (checkedModule[0].mixAsgYn !== mixAsgYn) {
swalFire({ text: getMessage('modal.module.basic.setting.module.placement.mix.asg.yn.error') })
swalFire({ text: getMessage('modal.module.basic.setting.module.placement.mix.asg.yn.error'), icon: 'warning' })
return
}
}
@ -1425,7 +1425,7 @@ export function useModuleBasicSetting(tabNum) {
// canvas.renderAll()
}
} else {
swalFire({ text: getMessage('module.place.overlab') })
swalFire({ text: getMessage('module.place.overlab'), icon: 'warning' })
return
}
}
@ -1520,7 +1520,7 @@ export function useModuleBasicSetting(tabNum) {
// canvas.renderAll()
}
} else {
swalFire({ text: getMessage('module.place.overlab') })
swalFire({ text: getMessage('module.place.overlab'), icon: 'warning' })
return
}
}
@ -1613,7 +1613,7 @@ export function useModuleBasicSetting(tabNum) {
// canvas.renderAll()
}
} else {
swalFire({ text: getMessage('module.place.overlab') })
swalFire({ text: getMessage('module.place.overlab'), icon: 'warning' })
return
}
}
@ -1705,7 +1705,7 @@ export function useModuleBasicSetting(tabNum) {
// canvas.renderAll()
}
} else {
swalFire({ text: getMessage('module.place.overlab') })
swalFire({ text: getMessage('module.place.overlab'), icon: 'warning' })
return
}
}
@ -1790,7 +1790,7 @@ export function useModuleBasicSetting(tabNum) {
const batchObjects = canvas?.getObjects().filter((obj) => obj.name === POLYGON_TYPE.OBJECT_SURFACE) //도머s 객체
if (moduleSetupSurfaces.length === 0) {
swalFire({ text: getMessage('module.place.no.surface') })
swalFire({ text: getMessage('module.place.no.surface'), icon: 'warning' })
return
}
@ -3119,13 +3119,13 @@ export function useModuleBasicSetting(tabNum) {
let moduleSetupSurfaces = canvas?.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) //모듈설치면를 가져옴
if (isManualModuleSetup) {
if (checkedModule.length === 0) {
swalFire({ text: getMessage('module.place.select.module') })
swalFire({ text: getMessage('module.place.select.module'), icon: 'warning' })
setIsManualModuleSetup(!isManualModuleSetup)
return
}
if (checkedModule.length > 1) {
swalFire({ text: getMessage('module.place.select.one.module') })
swalFire({ text: getMessage('module.place.select.one.module'), icon: 'warning' })
setIsManualModuleSetup(!isManualModuleSetup)
return
}
@ -3438,7 +3438,7 @@ export function useModuleBasicSetting(tabNum) {
const mixAsgYn = trestlePolygon.modules[0].moduleInfo.mixAsgYn
//현재 체크된 모듈기준으로 혼합가능인지 확인 Y === Y, N === N 일때만 설치 가능
if (checkedModule[0].mixAsgYn !== mixAsgYn) {
swalFire({ text: getMessage('modal.module.basic.setting.module.placement.mix.asg.yn.error') })
swalFire({ text: getMessage('modal.module.basic.setting.module.placement.mix.asg.yn.error'), icon: 'warning' })
return
}
}
@ -3471,7 +3471,7 @@ export function useModuleBasicSetting(tabNum) {
const intersection = turf.intersect(turf.featureCollection([dormerTurfPolygon, tempTurfModule])) //겹치는지 확인
//겹치면 안됨
if (intersection) {
swalFire({ text: getMessage('module.place.overobject') })
swalFire({ text: getMessage('module.place.overobject'), icon: 'warning' })
isIntersection = false
}
})
@ -3489,10 +3489,10 @@ export function useModuleBasicSetting(tabNum) {
manualDrawModules.push(manualModule)
setModuleStatisticsData()
} else {
swalFire({ text: getMessage('module.place.overlab') })
swalFire({ text: getMessage('module.place.overlab'), icon: 'warning' })
}
} else {
swalFire({ text: getMessage('module.place.out') })
swalFire({ text: getMessage('module.place.out'), icon: 'warning' })
}
}
})
@ -3522,7 +3522,7 @@ export function useModuleBasicSetting(tabNum) {
//Y인 모듈과 N인 모듈이 둘다 존재하면 설치 불가
if (mixAsgY.length > 0 && mixAsgN.length > 0) {
swalFire({ text: getMessage('modal.module.basic.setting.module.placement.mix.asg.yn.error') })
swalFire({ text: getMessage('modal.module.basic.setting.module.placement.mix.asg.yn.error'), icon: 'warning' })
return
}

2
src/locales/ja.json
View File

@ -1079,5 +1079,5 @@
"modal.module.basic.setting.module.placement.mix.asg.yn.error": "混合インストール不可能なモジュールです。 (JA)",
"modal.module.basic.setting.module.placement.mix.asg.yn": "混合",
"modal.module.basic.setting.layoutpassivity.placement": "layout配置 (JA)",
"modal.module.basic.setting.module.placement.over.max.row": "{0}의 최대단수를 초과했습니다. 최대단수표를 참고해 주세요.(JA)"
"modal.module.basic.setting.module.placement.over.max.row": "{0} 最大段数超過しました。最大段数表を参考にしてください。"
}