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

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

Browse Source
This commit is contained in:
yjnoh 2025-03-10 11:30:53 +09:00
commit d84a386856
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
View File

@ -181,19 +181,19 @@ export default function StepUp(props) {
modules.forEach((module) => { modules.forEach((module) => {
if (!module.circuit || !module.pcsItemId) return if (!module.circuit || !module.pcsItemId) return
if (!pcsSummary[module.pcsItemId]) { if (!pcsSummary[module.circuit.circuitInfo.id]) {
pcsSummary[module.pcsItemId] = { pcsSummary[module.circuit.circuitInfo.id] = {
circuits: {}, circuits: {},
totalModules: 0, totalModules: 0,
} }
} }
const circuitNumber = module.circuitNumber const circuitNumber = module.circuitNumber
if (!pcsSummary[module.pcsItemId].circuits[circuitNumber]) { if (!pcsSummary[module.circuit.circuitInfo.id].circuits[circuitNumber]) {
pcsSummary[module.pcsItemId].circuits[circuitNumber] = 0 pcsSummary[module.circuit.circuitInfo.id].circuits[circuitNumber] = 0
} }
pcsSummary[module.pcsItemId].circuits[circuitNumber]++ pcsSummary[module.circuit.circuitInfo.id].circuits[circuitNumber]++
pcsSummary[module.pcsItemId].totalModules++ pcsSummary[module.circuit.circuitInfo.id].totalModules++
}) })
const params = { const params = {
@ -205,8 +205,8 @@ export default function StepUp(props) {
getPcsConnOptionItemList(params).then((res) => { getPcsConnOptionItemList(params).then((res) => {
if (res?.result.code === 200 && res?.data) { if (res?.result.code === 200 && res?.data) {
/** PCS 아이템 리스트에 serQtyList 추가 */ /** PCS 아이템 리스트에 serQtyList 추가 */
const pcsItemListWithSerQty = res.data.pcsItemList.map((pcsItem) => { const pcsItemListWithSerQty = res.data.pcsItemList.map((pcsItem, index) => {
const pcsData = pcsSummary[pcsItem.itemId] || { circuits: {}, totalModules: 0 } const pcsData = pcsSummary[selectedModels[index].id] || { circuits: {}, totalModules: 0 }
const circuitCounts = Object.values(pcsData.circuits) const circuitCounts = Object.values(pcsData.circuits)
return { return {
...pcsItem, ...pcsItem,

9
src/hooks/usePlan.js
View File

@ -5,7 +5,7 @@ import { usePathname, useRouter } from 'next/navigation'
import { useRecoilState, useResetRecoilState } from 'recoil' import { useRecoilState, useResetRecoilState } from 'recoil'
import { canvasState, currentCanvasPlanState, plansState, canvasSettingState } from '@/store/canvasAtom' import { canvasState, currentCanvasPlanState, plansState, canvasSettingState, currentObjectState, moduleSetupSurfaceState } from '@/store/canvasAtom'
import { useAxios } from '@/hooks/useAxios' import { useAxios } from '@/hooks/useAxios'
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
import { useSwal } from '@/hooks/useSwal' import { useSwal } from '@/hooks/useSwal'
@ -61,6 +61,11 @@ export function usePlan(params = {}) {
const [selectedModules, setSelectedModules] = useRecoilState(selectedModuleState) const [selectedModules, setSelectedModules] = useRecoilState(selectedModuleState)
const { selectedMenu, setSelectedMenu } = useCanvasMenu() const { selectedMenu, setSelectedMenu } = useCanvasMenu()
//선택된 객체 초기화
const resetCurrentObject = useResetRecoilState(currentObjectState)
//선택된 모듈 배치면 초기화
const resetModuleSetupSurface = useResetRecoilState(moduleSetupSurfaceState)
/** /**
* 마우스 포인터의 가이드라인 제거 * 마우스 포인터의 가이드라인 제거
*/ */
@ -415,6 +420,8 @@ export function usePlan(params = {}) {
useEffect(() => { useEffect(() => {
setSelectedPlan(currentCanvasPlan) setSelectedPlan(currentCanvasPlan)
handleCurrentPlanUrl() handleCurrentPlanUrl()
resetCurrentObject()
resetModuleSetupSurface()
}, [currentCanvasPlan]) }, [currentCanvasPlan])
/** /**