Compare commits

..

No commits in common. "64c4ad3173c0dd586323288d8a0df27852116838" and "9f7e0ede08c3998405ffe0914ccff3345995a8a9" have entirely different histories.

3 changed files with 2 additions and 44 deletions

View File

@ -359,10 +359,6 @@ export function useMasterController() {
})
}
const quotationErrSave = async (params) => {
return await post({ url: '/api/v1/master/quotationErrSave', data: params })
}
return {
getRoofMaterialList,
getModuleTypeItemList,
@ -378,6 +374,5 @@ export function useMasterController() {
updateObjectDate,
getQuotationItem,
getPcsConnOptionItemList,
quotationErrSave,
}
}

View File

@ -1,5 +1,5 @@
import { useRecoilValue } from 'recoil'
import { canvasState, currentAngleTypeSelector, currentCanvasPlanState } from '@/store/canvasAtom'
import { canvasState, currentAngleTypeSelector } from '@/store/canvasAtom'
import { POLYGON_TYPE, TRESTLE_MATERIAL } from '@/common/common'
import { moduleSelectionDataState } from '@/store/selectedModuleOptions'
import { getDegreeByChon } from '@/util/canvas-util'
@ -11,7 +11,6 @@ import { useContext } from 'react'
import { QcastContext } from '@/app/QcastProvider'
import { useCircuitTrestle } from '@/hooks/useCirCuitTrestle'
import { useMessage } from '@/hooks/useMessage'
import { loginUserStore } from '@/store/commonAtom'
// 모듈간 같은 행, 열의 마진이 10 이하인 경우는 같은 행, 열로 간주
const MODULE_MARGIN = 10
@ -19,9 +18,7 @@ const MODULE_MARGIN = 10
export const useTrestle = () => {
const canvas = useRecoilValue(canvasState)
const moduleSelectionData = useRecoilValue(moduleSelectionDataState) //다음으로 넘어가는 최종 데이터
const { getQuotationItem, quotationErrSave } = useMasterController()
const currentCanvasPlan = useRecoilValue(currentCanvasPlanState)
const loginUserState = useRecoilValue(loginUserStore)
const { getQuotationItem } = useMasterController()
const currentAngleType = useRecoilValue(currentAngleTypeSelector)
const roofSizeSet = useRecoilValue(basicSettingState).roofSizeSet
const isTrestleDisplay = useRecoilValue(trestleDisplaySelector)
@ -760,12 +757,6 @@ export const useTrestle = () => {
text: result.resultMsg || getMessage('common.message.noData'),
icon: 'error'
})
quotationErrSave({
objectNo: currentCanvasPlan.objectNo,
planNo: currentCanvasPlan.planNo,
rejectRsn: result.resultMsg,
regId: loginUserState.userId,
})
clear()
setViewCircuitNumberTexts(true)
setIsGlobalLoading(false)

View File

@ -489,34 +489,6 @@ export function useCanvasEvent() {
viewportTransform[5] += deltaY
canvas.setViewportTransform(viewportTransform)
// 브라우저 스크롤을 중앙으로 조정하여 전체 canvas를 모니터 중앙에 위치
const canvasElement = canvas.getElement()
const canvasRect = canvasElement.getBoundingClientRect()
// 현재 스크롤 위치
const currentScrollTop = window.pageYOffset || document.documentElement.scrollTop
const currentScrollLeft = window.pageXOffset || document.documentElement.scrollLeft
// canvas의 현재 화면 위치
const canvasScreenTop = canvasRect.top + currentScrollTop
const canvasScreenLeft = canvasRect.left + currentScrollLeft
// 모니터 중앙
const monitorCenterX = window.innerWidth / 2
const monitorCenterY = window.innerHeight / 2
// canvas가 모니터 중앙에 오도록 스크롤 위치 계산
const targetScrollLeft = canvasScreenLeft + (canvasRect.width / 2) - monitorCenterX
const targetScrollTop = canvasScreenTop + (canvasRect.height / 2) - monitorCenterY + menuHeightOffset
// 스크롤을 중앙으로 이동
window.scrollTo({
top: targetScrollTop,
left: targetScrollLeft,
behavior: 'smooth' // 부드러운 스크롤
})
canvas.renderAll()
}