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

Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

Browse Source
This commit is contained in:
hyojun.choi 2025-02-25 10:22:05 +09:00
commit 81bc1604ba
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/floor-plan/CanvasMenu.jsx
View File

@ -222,7 +222,7 @@ export default function CanvasMenu(props) {
} }
await reloadCanvasStatus(objectNo, pid) await reloadCanvasStatus(objectNo, pid)
break break
case 4: case 'module':
if (selectedMenu < menu.index) { if (selectedMenu < menu.index) {
if (!checkMenuAndCanvasState()) { if (!checkMenuAndCanvasState()) {
swalFire({ text: getMessage('menu.validation.canvas.roof') }) swalFire({ text: getMessage('menu.validation.canvas.roof') })
@ -236,7 +236,7 @@ export default function CanvasMenu(props) {
} }
await reloadCanvasStatus(objectNo, pid) await reloadCanvasStatus(objectNo, pid)
break break
case 5: case 'estimate':
setIsGlobalLoading(true) setIsGlobalLoading(true)
promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => { promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => {
if (res.status === 200) { if (res.status === 200) {
@ -246,7 +246,7 @@ export default function CanvasMenu(props) {
setCurrentMenu(menu.title) setCurrentMenu(menu.title)
setFloorPlanObjectNo({ floorPlanObjectNo: objectNo }) setFloorPlanObjectNo({ floorPlanObjectNo: objectNo })
setIsGlobalLoading(false) setIsGlobalLoading(false)
router.push(`/floor-plan/estimate/${menu.type}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) router.push(`/floor-plan/estimate/5?pid=${selectedPlan.planNo}&objectNo=${objectNo}`)
if (pathname === '/floor-plan/estimate/5') { if (pathname === '/floor-plan/estimate/5') {
setIsGlobalLoading(false) setIsGlobalLoading(false)
} }
@ -257,7 +257,7 @@ export default function CanvasMenu(props) {
} }
}) })
break break
case 6: case 'simulation':
setIsGlobalLoading(true) setIsGlobalLoading(true)
promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => { promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => {
if (res.status === 200) { if (res.status === 200) {
@ -265,7 +265,7 @@ export default function CanvasMenu(props) {
if (estimateDetail.estimateDate !== null && estimateDetail.docNo) { if (estimateDetail.estimateDate !== null && estimateDetail.docNo) {
setSelectedMenu(menu.type) setSelectedMenu(menu.type)
setCurrentMenu(menu.title) setCurrentMenu(menu.title)
router.push(`/floor-plan/simulator/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) router.push(`/floor-plan/simulator/6?pid=${selectedPlan.planNo}&objectNo=${objectNo}`)
if (pathname === '/floor-plan/simulator/6') { if (pathname === '/floor-plan/simulator/6') {
setIsGlobalLoading(false) setIsGlobalLoading(false)
} }
@ -283,7 +283,6 @@ export default function CanvasMenu(props) {
setCurrentMenu(menu.title) setCurrentMenu(menu.title)
} }
if (pathname !== '/floor-plan') { if (pathname !== '/floor-plan') {
// if (menu.index !== 0 ) {
//견적서 or 발전시뮬레이션 탭에서 같은 탭 클릭시 화면 이동했다 돌아오지않도록.. //견적서 or 발전시뮬레이션 탭에서 같은 탭 클릭시 화면 이동했다 돌아오지않도록..
if (menu.type !== 'drawing' && menu.type !== 'estimate' && menu.type !== 'simulation') { if (menu.type !== 'drawing' && menu.type !== 'estimate' && menu.type !== 'simulation') {
router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`) router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)

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

@ -1333,9 +1333,9 @@ export function useModuleBasicSetting(tabNum) {
installedLastHeightCoord = moduleY + height + heightMargin installedLastHeightCoord = moduleY + height + heightMargin
} else { } else {
//디버깅용 //디버깅용
tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 }) // tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 })
canvas?.add(tempModule) // canvas?.add(tempModule)
canvas.renderAll() // canvas.renderAll()
} }
} }
if (isInstall) { if (isInstall) {
@ -1643,9 +1643,9 @@ export function useModuleBasicSetting(tabNum) {
// } // }
} else { } else {
//디버깅용 //디버깅용
tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 }) // tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 })
canvas?.add(tempModule) // canvas?.add(tempModule)
canvas.renderAll() // canvas.renderAll()
} }
} }
@ -2625,7 +2625,7 @@ export function useModuleBasicSetting(tabNum) {
* 스냅기능 * 스냅기능
*/ */
let snapDistance = 10 let snapDistance = 10
let cellSnapDistance = 20 let cellSnapDistance = 50
let intvHor = flowDirection === 'south' || flowDirection === 'north' ? 1 : 3 let intvHor = flowDirection === 'south' || flowDirection === 'north' ? 1 : 3
let intvVer = flowDirection === 'south' || flowDirection === 'north' ? 3 : 1 let intvVer = flowDirection === 'south' || flowDirection === 'north' ? 3 : 1

2
src/store/menuAtom.js
View File

@ -14,7 +14,7 @@ export const selectedMenuState = atom({
export const menusState = atom({ export const menusState = atom({
key: 'menusState', key: 'menusState',
default: [ default: [
{ type: 'drawing', name: 'plan.menu.plan.drawing', icon: 'con00', title: MENU.PLAN_DRAWING }, //. 도면 작성 { type: 'drawing', name: 'plan.menu.plan.drawing', icon: 'con00', title: MENU.PLAN_DRAWING }, //. 물건정보
{ {
type: 'placement', // 배치면 초기설정 type: 'placement', // 배치면 초기설정
name: 'plan.menu.placement.surface.initial.setting', name: 'plan.menu.placement.surface.initial.setting',