diff --git a/src/components/common/select/QSelectBox.jsx b/src/components/common/select/QSelectBox.jsx
index 12c72b5e..f1041da3 100644
--- a/src/components/common/select/QSelectBox.jsx
+++ b/src/components/common/select/QSelectBox.jsx
@@ -1,6 +1,7 @@
'use client'
import { useEffect, useRef, useState } from 'react'
import { useOnClickOutside } from 'usehooks-ts'
+import { useMessage } from '@/hooks/useMessage'
/**
*
@@ -26,13 +27,15 @@ export default function QSelectBox({
showKey = '',
params = {},
}) {
+ const { getMessage } = useMessage()
+
/**
* 초기 상태 처리
* useState 초기 값으로 사용해야 해서 useState 보다 위에 작성
* @returns {string} 초기 상태
*/
const handleInitState = () => {
- if (options.length === 0) return title !== '' ? title : '선택하세요.'
+ if (options.length === 0) return title !== '' ? title : getMessage('selectbox.title')
if (showKey !== '' && !value) {
//value가 없으면 showKey가 있으면 우선 보여준다
// return options[0][showKey]
@@ -44,13 +47,13 @@ export default function QSelectBox({
return option[sourceKey] === value[targetKey]
})
if (!option) {
- return title !== '' ? title : '선택하세요.'
+ return title !== '' ? title : getMessage('selectbox.title')
} else {
return option[showKey]
}
} else {
//일치하는 조건이 없으면 기본값을 보여준다.
- return title !== '' ? title : '선택하세요.'
+ return title !== '' ? title : getMessage('selectbox.title')
}
}
diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx
index a97cb4cb..609ba73e 100644
--- a/src/components/estimate/Estimate.jsx
+++ b/src/components/estimate/Estimate.jsx
@@ -19,10 +19,11 @@ import { convertNumberToPriceDecimal, convertNumberToPriceDecimalToFixed } from
import ProductFeaturesPop from './popup/ProductFeaturesPop'
import { v4 as uuidv4 } from 'uuid'
import { correntObjectNoState } from '@/store/settingAtom'
-import { useRouter, useSearchParams } from 'next/navigation'
-import { FloorPlanContext } from '@/app/floor-plan/FloorPlanProvider'
+import { useSearchParams } from 'next/navigation'
import { usePlan } from '@/hooks/usePlan'
import { usePopup } from '@/hooks/usePopup'
+import { useSwal } from '@/hooks/useSwal'
+import { QcastContext } from '@/app/QcastProvider'
export default function Estimate({}) {
const [uniqueData, setUniqueData] = useState([])
@@ -33,6 +34,8 @@ export default function Estimate({}) {
const [objectNo, setObjectNo] = useState('') //물건번호
const [planNo, setPlanNo] = useState('') //플랜번호
+ const { swalFire } = useSwal()
+
const [files, setFiles] = useState([]) // 보내는 첨부파일
const [originFiles, setOriginFiles] = useState([]) //기존 첨부파일
@@ -79,6 +82,7 @@ export default function Estimate({}) {
const [specialNoteList, setSpecialNoteList] = useState([])
const [popShowSpecialNoteList, setPopShowSpecialNoteList] = useState([])
+ const { setIsGlobalLoading } = useContext(QcastContext)
const globalLocaleState = useRecoilValue(globalLocaleStore)
const { get, post, promisePost } = useAxios(globalLocaleState)
@@ -347,7 +351,11 @@ export default function Estimate({}) {
setEstimateContextState({
originFiles: originFiles,
})
- alert(getMessage('estimate.detail.alert.delFile'))
+
+ swalFire({
+ text: getMessage('estimate.detail.alert.delFile'),
+ type: 'alert',
+ })
}
//가격표시 option 목록 최초세팅 && 주문분류 변경시
@@ -476,10 +484,15 @@ export default function Estimate({}) {
if (!pass) {
//Pricing이 누락된 아이템이 있습니다. Pricing을 진행해주세요.
- return alert(getMessage('estimate.detail.showPrice.pricingBtn.noItemId'))
+ return swalFire({
+ text: getMessage('estimate.detail.showPrice.pricingBtn.noItemId'),
+ type: 'alert',
+ icon: 'warning',
+ })
}
}
+ setIsGlobalLoading(true)
await promisePost({ url: '/api/estimate/price/item-price-list', data: param }).then((res) => {
let updateList = []
if (res) {
@@ -527,6 +540,7 @@ export default function Estimate({}) {
}
}
}
+ setIsGlobalLoading(false)
})
}
@@ -787,7 +801,11 @@ export default function Estimate({}) {
const removeItem = () => {
const array = [...selection]
if (isEmptyArray(array)) {
- return alert(getMessage('estimate.detail.alert.selectDelItem'))
+ return swalFire({
+ text: getMessage('estimate.detail.alert.selectDelItem'),
+ type: 'alert',
+ icon: 'warning',
+ })
}
let delList = []
estimateContextState.itemList.filter((row) => {
@@ -817,7 +835,11 @@ export default function Estimate({}) {
})
if (delCnt === updateList.length) {
- return alert(getMessage('estimate.detail.save.requiredItem'))
+ return swalFire({
+ text: getMessage('estimate.detail.save.requiredItem'),
+ type: 'alert',
+ icon: 'warning',
+ })
}
setEstimateContextState({
@@ -1188,7 +1210,7 @@ export default function Estimate({}) {
@@ -1206,7 +1228,7 @@ export default function Estimate({}) {
@@ -1297,13 +1319,13 @@ export default function Estimate({}) {
//사양시공
let constructSpecificationMulti = estimateContextState?.constructSpecificationMulti?.split('、')
return (
-
+
@@ -1316,7 +1338,6 @@ export default function Estimate({}) {
{getMessage('estimate.detail.remarks')} |
- {/* */}
+ {estimateContextState?.northArrangement === '1' && (
+ {getMessage('estimate.detail.dragFileGuide')}
+ )}
diff --git a/src/components/estimate/popup/DocDownOptionPop.jsx b/src/components/estimate/popup/DocDownOptionPop.jsx
index 50dfd018..13477b63 100644
--- a/src/components/estimate/popup/DocDownOptionPop.jsx
+++ b/src/components/estimate/popup/DocDownOptionPop.jsx
@@ -4,20 +4,21 @@ import { useMessage } from '@/hooks/useMessage'
import { useAxios } from '@/hooks/useAxios'
import { useRecoilValue } from 'recoil'
import { floorPlanObjectState, estimateState } from '@/store/floorPlanObjectAtom'
-import { usePathname } from 'next/navigation'
+import { usePathname, useSearchParams } from 'next/navigation'
export default function DocDownOptionPop({ planNo, setEstimatePopupOpen, docDownPopLockFlg }) {
const { getMessage } = useMessage()
const { promisePost } = useAxios()
const pathName = usePathname()
+ const searchParams = useSearchParams()
//EXCEL, PDF 구분
const [schDownload, setSchDownload] = useState('EXCEL')
//다운로드 파일 EXCEL
const [schUnitPriceFlg, setSchUnitPriceFlg] = useState('0')
//견적제출서 표시명
- const [schDisplayFlg, setSchSchDisplayFlg] = useState('0')
+ const [schDisplayFlg, setSchDisplayFlg] = useState('0')
//가대 중량표 포함(포함:1 미포함 : 0)
const [schWeightFlg, setSchWeightFlg] = useState('1')
//도면/시뮬레이션 파일 포함
@@ -53,8 +54,9 @@ export default function DocDownOptionPop({ planNo, setEstimatePopupOpen, docDown
defaultSchDrawingFlg = defaultSchDrawingFlg.concat('|', '2', '|', '3')
}
+ //objectRecoil.floorPlanObjectNo가 비워지는 경우가 있어서 없으면 url에서 뺴오도록 추가
const params = {
- objectNo: objectRecoil.floorPlanObjectNo,
+ objectNo: objectRecoil?.floorPlanObjectNo ? objectRecoil.floorPlanObjectNo : searchParams.get('objectNo'),
planNo: planNo,
schDownload: schDownload,
schUnitPriceFlg: sendUnitPriceFlg,
@@ -206,7 +208,7 @@ export default function DocDownOptionPop({ planNo, setEstimatePopupOpen, docDown
value={'0'}
checked={schDisplayFlg === '0'}
onChange={(e) => {
- setSchSchDisplayFlg(e.target.value)
+ setSchDisplayFlg(e.target.value)
}}
/>
@@ -219,7 +221,7 @@ export default function DocDownOptionPop({ planNo, setEstimatePopupOpen, docDown
value={'1'}
checked={schDisplayFlg === '1'}
onChange={(e) => {
- setSchSchDisplayFlg(e.target.value)
+ setSchDisplayFlg(e.target.value)
}}
/>
diff --git a/src/components/estimate/popup/EstimateCopyPop.jsx b/src/components/estimate/popup/EstimateCopyPop.jsx
index 001de6e9..35d8d54b 100644
--- a/src/components/estimate/popup/EstimateCopyPop.jsx
+++ b/src/components/estimate/popup/EstimateCopyPop.jsx
@@ -69,7 +69,7 @@ export default function EstimateCopyPop({ planNo, setEstimateCopyPopupOpen }) {
get({ url: url }).then((res) => {
if (!isEmptyArray(res)) {
res.map((row) => {
- row.value == row.saleStoreId
+ row.value = row.saleStoreId
row.label = row.saleStoreName
})
otherList = res
diff --git a/src/components/estimate/popup/ProductFeaturesPop.jsx b/src/components/estimate/popup/ProductFeaturesPop.jsx
index f2d98800..b6b02c64 100644
--- a/src/components/estimate/popup/ProductFeaturesPop.jsx
+++ b/src/components/estimate/popup/ProductFeaturesPop.jsx
@@ -7,16 +7,16 @@ export default function ProductFeaturesPop({ popShowSpecialNoteList, showProduct
useEffect(() => {
let pushData = []
- popShowSpecialNoteList.map((row) => {
+ popShowSpecialNoteList.forEach((row) => {
let option = showProductFeatureData.split('、')
- option.map((row2) => {
+ option.forEach((row2) => {
if (row.code === row2) {
pushData.push(row)
}
})
})
setShowSpecialNoteList(pushData)
- }, [popShowSpecialNoteList])
+ }, [popShowSpecialNoteList, showProductFeatureData])
return (
diff --git a/src/components/fabric/QPolygon.js b/src/components/fabric/QPolygon.js
index 26563ad3..22ef408b 100644
--- a/src/components/fabric/QPolygon.js
+++ b/src/components/fabric/QPolygon.js
@@ -249,6 +249,9 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
},
addLengthText() {
+ if ([POLYGON_TYPE.MODULE, 'arrow', POLYGON_TYPE.MODULE_SETUP_SURFACE, POLYGON_TYPE.OBJECT_SURFACE].includes(this.name)) {
+ return
+ }
this.canvas
?.getObjects()
.filter((obj) => obj.name === 'lengthText' && obj.parentId === this.id)
diff --git a/src/components/floor-plan/CanvasFrame.jsx b/src/components/floor-plan/CanvasFrame.jsx
index 31698b1a..f5ecb10d 100644
--- a/src/components/floor-plan/CanvasFrame.jsx
+++ b/src/components/floor-plan/CanvasFrame.jsx
@@ -16,7 +16,16 @@ import { totalDisplaySelector } from '@/store/settingAtom'
import { MENU } from '@/common/common'
import { FloorPlanContext } from '@/app/floor-plan/FloorPlanProvider'
import { QcastContext } from '@/app/QcastProvider'
-import { moduleStatisticsState } from '@/store/circuitTrestleAtom'
+import {
+ makersState,
+ modelsState,
+ moduleStatisticsState,
+ pcsCheckState,
+ selectedMakerState,
+ selectedModelsState,
+ seriesState,
+} from '@/store/circuitTrestleAtom'
+import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
export default function CanvasFrame() {
const canvasRef = useRef(null)
@@ -25,33 +34,59 @@ export default function CanvasFrame() {
const currentMenu = useRecoilValue(currentMenuState)
const { floorPlanState } = useContext(FloorPlanContext)
const { contextMenu, handleClick } = useContextMenu()
- const { currentCanvasPlan } = usePlan()
+ const { plans, currentCanvasPlan, resetCanvasStatus } = usePlan()
const totalDisplay = useRecoilValue(totalDisplaySelector) // 집계표 표시 여부
const { setIsGlobalLoading } = useContext(QcastContext)
- const [moduleStatistics, setModuleStatistics] = useRecoilState(moduleStatisticsState)
- const reset = useResetRecoilState(moduleStatisticsState)
+ const resetModuleStatisticsState = useResetRecoilState(moduleStatisticsState)
+ const resetMakersState = useResetRecoilState(makersState)
+ const resetSelectedMakerState = useResetRecoilState(selectedMakerState)
+ const resetSeriesState = useResetRecoilState(seriesState)
+ const resetModelsState = useResetRecoilState(modelsState)
+ const resetSelectedModelsState = useResetRecoilState(selectedModelsState)
+ const resetPcsCheckState = useResetRecoilState(pcsCheckState)
+ const { handleModuleSelectionTotal } = useCanvasPopupStatusController()
+
const loadCanvas = () => {
- if (canvas) {
- canvas?.clear() // 캔버스를 초기화합니다.
- if (currentCanvasPlan?.canvasStatus && floorPlanState.objectNo === currentCanvasPlan.objectNo) {
- canvas?.loadFromJSON(JSON.parse(currentCanvasPlan.canvasStatus), function () {
+ if (!canvas) return
+
+ canvas?.clear() // 캔버스를 초기화합니다.
+ if (currentCanvasPlan) {
+ const plan = plans.find((plan) => plan.id === currentCanvasPlan.id)
+ if (plan?.canvasStatus && floorPlanState.objectNo === currentCanvasPlan.objectNo) {
+ canvas?.loadFromJSON(JSON.parse(plan.canvasStatus), function () {
canvasLoadInit() //config된 상태로 캔버스 객체를 그린다
canvas?.renderAll() // 캔버스를 다시 그립니다.
})
}
- gridInit()
}
+ gridInit()
}
useEffect(() => {
loadCanvas()
- reset()
+ resetRecoilData()
+ Object.keys(currentCanvasPlan).length > 0 && handleModuleSelectionTotal()
}, [currentCanvasPlan, canvas])
useEffect(() => {
setIsGlobalLoading(false)
+
+ return () => {
+ canvas?.clear()
+ resetCanvasStatus()
+ }
}, [])
+ const resetRecoilData = () => {
+ resetModuleStatisticsState()
+ resetMakersState()
+ resetSelectedMakerState()
+ resetSeriesState()
+ resetModelsState()
+ resetSelectedModelsState()
+ resetPcsCheckState()
+ }
+
return (
diff --git a/src/components/floor-plan/CanvasLayout.jsx b/src/components/floor-plan/CanvasLayout.jsx
index bc1a4007..6a7d5ef0 100644
--- a/src/components/floor-plan/CanvasLayout.jsx
+++ b/src/components/floor-plan/CanvasLayout.jsx
@@ -1,6 +1,7 @@
'use client'
import { useContext, useEffect } from 'react'
+import { usePathname } from 'next/navigation'
import { useRecoilValue } from 'recoil'
import { FloorPlanContext } from '@/app/floor-plan/FloorPlanProvider'
import { SessionContext } from '@/app/SessionProvider'
@@ -12,6 +13,7 @@ import { globalLocaleStore } from '@/store/localeAtom'
export default function CanvasLayout({ children }) {
// const { menuNumber } = props
+ const pathname = usePathname()
const { menuNumber } = useCanvasMenu()
const { session } = useContext(SessionContext)
const { floorPlanState } = useContext(FloorPlanContext)
@@ -37,10 +39,12 @@ export default function CanvasLayout({ children }) {
onClick={() => handleCurrentPlan(plan.id)}
>
{`Plan ${plan.planNo}`}
- {index !== 0 && (
+ {index !== 0 && !pathname.includes('/estimate') && !pathname.includes('/simulator') && (
+ onClick={(e) => {
+ //삭제 아이콘 눌렀는데 handleCurrentPlan실행되서 추가
+ e.stopPropagation()
swalFire({
text: `Plan ${plan.planNo} ` + getMessage('plan.message.confirm.delete'),
type: 'confirm',
@@ -48,13 +52,13 @@ export default function CanvasLayout({ children }) {
handleDeletePlan(e, plan)
},
})
- }
+ }}
>
)}
))}
- {plans.length < 10 && (
+ {plans.length < 10 && !pathname.includes('/estimate') && !pathname.includes('/simulator') && (
{/* 설정 오류시 노출 */}
- ※ 施工方法が選択できません。 基準風速または基準積雪量を確認してください。
+
{
}, [compasDeg])
const checkDegree = (e) => {
- if (numberCheck(Number(e)) && Number(e) >= -180 && Number(e) <= 180) {
- setCompasDeg(Number(e))
+ if (e === '-0' || e === '-') {
+ setCompasDeg('-')
+ return
+ }
+ if (e === '0-') {
+ setCompasDeg('-0')
+ return
+ }
+ if (Number(e) >= -180 && Number(e) <= 180) {
+ if (numberCheck(Number(e))) {
+ setCompasDeg(Number(e))
+ }
} else {
setCompasDeg(compasDeg)
}
@@ -46,8 +56,14 @@ export const Orientation = forwardRef(({ tabNum }, ref) => {
{Array.from({ length: 180 / 15 }).map((dot, index) => (
setCompasDeg(15 * (12 + index))}
+ className={`circle ${getDegreeInOrientation(compasDeg) === -1 * (-15 * index + 180) || (index === 0 && compasDeg >= 172 && index === 0 && compasDeg <= 180) || (compasDeg === -180 && index === 0) ? 'act' : ''}`}
+ onClick={() => {
+ if (index === 0) {
+ setCompasDeg(180)
+ return
+ }
+ setCompasDeg(-1 * (-15 * index + 180))
+ }}
>
{index === 0 && 180°}
{index === 6 && -90°}
@@ -56,7 +72,7 @@ export const Orientation = forwardRef(({ tabNum }, ref) => {
{Array.from({ length: 180 / 15 }).map((dot, index) => (
setCompasDeg(15 * index)}
>
{index === 0 && 0°}
diff --git a/src/components/floor-plan/modal/basic/step/Placement.jsx b/src/components/floor-plan/modal/basic/step/Placement.jsx
index eff568cd..4eeeab0a 100644
--- a/src/components/floor-plan/modal/basic/step/Placement.jsx
+++ b/src/components/floor-plan/modal/basic/step/Placement.jsx
@@ -2,25 +2,24 @@ import { forwardRef, useEffect, useState } from 'react'
import { useMessage } from '@/hooks/useMessage'
import { useModuleBasicSetting } from '@/hooks/module/useModuleBasicSetting'
import { checkedModuleState, currentCanvasPlanState } from '@/store/canvasAtom'
-import { useRecoilValue, useSetRecoilState } from 'recoil'
-import { moduleSelectionDataState } from '@/store/selectedModuleOptions'
-import { useModulePlace } from '@/hooks/module/useModulePlace'
+import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'
+import { moduleSelectionDataState, selectedModuleState } from '@/store/selectedModuleOptions'
+import { isObjectNotEmpty } from '@/util/common-utils'
const Placement = forwardRef((props, refs) => {
const { getMessage } = useMessage()
const [isChidori, setIsChidori] = useState(false)
const [isChidoriNotAble, setIsChidoriNotAble] = useState(false)
- const currentCanvasPlan = useRecoilValue(currentCanvasPlanState)
- const [setupLocation, setSetupLocation] = useState('center')
+ const [setupLocation, setSetupLocation] = useState('eaves')
const [isMaxSetup, setIsMaxSetup] = useState('false')
const [selectedItems, setSelectedItems] = useState({})
- const { makeModuleInstArea } = useModuleBasicSetting()
- const { selectedModules } = useModulePlace()
+ const [selectedModules, setSelectedModules] = useRecoilState(selectedModuleState)
const setCheckedModules = useSetRecoilState(checkedModuleState)
const moduleSelectionData = useRecoilValue(moduleSelectionDataState)
+ const { makeModuleInitArea } = useModuleBasicSetting(3)
//모듈 배치면 생성
useEffect(() => {
@@ -30,17 +29,39 @@ const Placement = forwardRef((props, refs) => {
if (isChidroriValue) {
setIsChidoriNotAble(true)
}
+ makeModuleInitArea(moduleSelectionData)
}
}, [])
+ //최초 지입시 체크
+ useEffect(() => {
+ if (isObjectNotEmpty(moduleSelectionData)) {
+ //두번째 선택한 데이터가를 기반으로 세번째 선택을 체크한다
+ if (moduleSelectionData.roofConstructions.length > 0 && moduleSelectionData.module.itemList.length > 0) {
+ let initCheckedModule = {}
+ moduleSelectionData.module.itemList.forEach((obj, index) => {
+ if (index === 0) {
+ initCheckedModule = { [obj.itemId]: true }
+ } else {
+ initCheckedModule = { ...initCheckedModule, [obj.itemId]: true }
+ }
+ })
+ setSelectedItems(initCheckedModule)
+ setSelectedModules(moduleSelectionData.module)
+ }
+ }
+ }, [moduleSelectionData])
+
//체크된 모듈 데이터
useEffect(() => {
- const checkedModuleIds = Object.keys(selectedItems).filter((key) => selectedItems[key])
- const moduleArray = selectedModules.itemList.filter((item) => {
- return checkedModuleIds.includes(item.itemId)
- })
- setCheckedModules(moduleArray)
- }, [selectedItems])
+ if (isObjectNotEmpty(selectedItems) && isObjectNotEmpty(selectedModules)) {
+ const checkedModuleIds = Object.keys(selectedItems).filter((key) => selectedItems[key])
+ const moduleArray = selectedModules.itemList.filter((item) => {
+ return checkedModuleIds.includes(item.itemId)
+ })
+ setCheckedModules(moduleArray)
+ }
+ }, [selectedItems, selectedModules])
const moduleData = {
header: [
@@ -77,20 +98,6 @@ const Placement = forwardRef((props, refs) => {
setSelectedItems({ ...selectedItems, [e.target.name]: e.target.checked })
}
- useEffect(() => {
- if (moduleSelectionData && moduleSelectionData.module.itemList.length > 0) {
- let initCheckedModule = {}
- moduleSelectionData.module.itemList.forEach((obj, index) => {
- if (index === 0) {
- initCheckedModule = { [obj.itemId]: true }
- } else {
- initCheckedModule = { ...initCheckedModule, [obj.itemId]: true }
- }
- })
- setSelectedItems(initCheckedModule)
- }
- }, [])
-
return (
<>
@@ -117,29 +124,27 @@ const Placement = forwardRef((props, refs) => {
{selectedModules.itemList &&
selectedModules.itemList.map((item, index) => (
- <>
-
- |
-
-
-
-
- |
-
-
-
- {item.itemNm}
-
- |
- {item.wpOut} |
-
-
+
+ |
+
+
+
+
+ |
+
+
+
+ {item.itemNm}
+
+ |
+ {item.wpOut} |
+
))}
@@ -215,10 +220,10 @@ const Placement = forwardRef((props, refs) => {
-
+ {/*
-
+ */}
diff --git a/src/components/floor-plan/modal/basic/step/pitch/PitchModule.jsx b/src/components/floor-plan/modal/basic/step/pitch/PitchModule.jsx
index 255833a8..39d0ee19 100644
--- a/src/components/floor-plan/modal/basic/step/pitch/PitchModule.jsx
+++ b/src/components/floor-plan/modal/basic/step/pitch/PitchModule.jsx
@@ -1,12 +1,22 @@
+import { useState, useEffect } from 'react'
+import { useRecoilState } from 'recoil'
import { useMessage } from '@/hooks/useMessage'
import QSelectBox from '@/components/common/select/QSelectBox'
+import { useMasterController } from '@/hooks/common/useMasterController'
+import { moduleSelectionDataState, selectedModuleState } from '@/store/selectedModuleOptions'
+import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
+import { isObjectNotEmpty } from '@/util/common-utils'
export default function PitchModule({}) {
const { getMessage } = useMessage()
- const SelectOption01 = [{ name: '0' }, { name: '0' }, { name: '0' }, { name: '0' }]
+ const { getModuleTypeItemList } = useMasterController()
+ const [moduleList, setModuleList] = useState([])
+ const [selectedModules, setSelectedModules] = useRecoilState(selectedModuleState) //선택된 모듈
+ const [moduleSelectionData, setModuleSelectionData] = useRecoilState(moduleSelectionDataState) //다음으로 넘어가는 최종 데이터
+
const moduleData = {
header: [
- { name: getMessage('module'), width: 150, prop: 'module', type: 'color-box' },
+ { name: getMessage('module'), width: 250, prop: 'module', type: 'color-box' },
{
name: `${getMessage('높이')} (mm)`,
prop: 'height',
@@ -14,24 +24,45 @@ export default function PitchModule({}) {
{ name: `${getMessage('width')} (mm)`, prop: 'width' },
{ name: `${getMessage('output')} (W)`, prop: 'output' },
],
- rows: [
- {
- module: { name: 'Re.RISE-G3 440', color: '#AA6768' },
- height: { name: '1134' },
- width: { name: '1722' },
- output: { name: '440' },
- },
- {
- module: {
- name: 'Re.RISE MS-G3 290',
- color: '#67A2AA',
- },
- height: { name: '1134' },
- width: { name: '1722' },
- output: { name: '240' },
- },
- ],
}
+
+ const getModuleData = async (roofsIds) => {
+ const list = await getModuleTypeItemList(roofsIds)
+ if (list.data.length > 0) {
+ //selectbox에 이름을 넣는다
+ list.data.forEach((item) => {
+ item.name = item.itemNm
+ })
+ //셀렉트박스 데이터 초기화
+ setModuleList(list.data)
+ }
+ }
+
+ useEffect(() => {
+ getModuleData(['FLAT_ROOF'])
+ }, [])
+
+ const handleChangeModule = (option) => {
+ //선택된 모듈
+ setSelectedModules(option) //선택값 저장
+ setModuleSelectionData({
+ ...moduleSelectionData,
+ flatModule: option,
+ })
+ moduleSelectedDataTrigger({
+ ...moduleSelectionData,
+ flatModule: option,
+ })
+ }
+
+ useEffect(() => {
+ if (isObjectNotEmpty(moduleSelectionData.flatModule) && moduleList.length > 0) {
+ handleChangeModule(moduleSelectionData.flatModule)
+ }
+ }, [moduleList])
+
+ const { trigger: moduleSelectedDataTrigger } = useCanvasPopupStatusController(2)
+
return (
<>
@@ -39,7 +70,17 @@ export default function PitchModule({}) {
{getMessage('modal.module.basic.setting.module.setting')}
-
+ {moduleList && (
+
+ )}
@@ -54,33 +95,21 @@ export default function PitchModule({}) {
- {moduleData.rows.map((row) => (
- <>
-
- {moduleData.header.map((header) => (
- <>
- {header.type === 'color-box' && (
- |
-
-
- {row[header.prop].name}
-
- |
- )}
- {!header.type && header.type !== 'color-box' && {row[header.prop].name} | }
-
- ))}
+ {selectedModules &&
+ selectedModules.itemList &&
+ selectedModules.itemList.map((row, index) => (
+
+ |
+
+
+ {row.itemNm}
+
+ |
+ {Number(row.shortAxis).toFixed(0)} |
+ {Number(row.longAxis).toFixed(0)} |
+ {Number(row.wpOut).toFixed(0)} |
-
- ))}
- {Array.from({ length: 3 - moduleData.rows.length }).map((_, i) => (
-
- |
- |
- |
- |
-
- ))}
+ ))}
diff --git a/src/components/floor-plan/modal/basic/step/pitch/PitchPlacement.jsx b/src/components/floor-plan/modal/basic/step/pitch/PitchPlacement.jsx
index a292ed2d..660d3717 100644
--- a/src/components/floor-plan/modal/basic/step/pitch/PitchPlacement.jsx
+++ b/src/components/floor-plan/modal/basic/step/pitch/PitchPlacement.jsx
@@ -1,49 +1,48 @@
import { forwardRef, useState, useEffect } from 'react'
import { useMessage } from '@/hooks/useMessage'
import { useModuleBasicSetting } from '@/hooks/module/useModuleBasicSetting'
-import { canvasState } from '@/store/canvasAtom'
-import { useRecoilValue } from 'recoil'
+import { canvasState, checkedModuleState } from '@/store/canvasAtom'
+import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'
import { POLYGON_TYPE } from '@/common/common'
import { useEvent } from '@/hooks/useEvent'
+import { moduleSelectionDataState } from '@/store/selectedModuleOptions'
const PitchPlacement = forwardRef((props, refs) => {
const { getMessage } = useMessage()
const [setupLocation, setSetupLocation] = useState('south')
- const { makeModuleInstArea } = useModuleBasicSetting()
const canvas = useRecoilValue(canvasState)
const { initEvent } = useEvent()
- useEffect(() => {
- makeModuleInstArea()
- }, [])
+ const { selectedModules } = useModuleBasicSetting(3)
+ const setCheckedModules = useSetRecoilState(checkedModuleState)
+ const moduleSelectionData = useRecoilValue(moduleSelectionDataState) //다음으로 넘어가는 최종 데이터
+ const [selectedItems, setSelectedItems] = useState({})
useEffect(() => {
handleChangeSetupLocation()
}, [setupLocation])
+ const handleSelectedItem = (e) => {
+ setSelectedItems({ ...selectedItems, [e.target.name]: e.target.checked })
+ }
+
const moduleData = {
header: [
{ type: 'check', name: '', prop: 'check', width: 70 },
{ type: 'color-box', name: getMessage('module'), prop: 'module' },
{ type: 'text', name: `${getMessage('output')} (W)`, prop: 'output', width: 70 },
],
- rows: [
- {
- check: false,
- module: { name: 'Re.RISE-G3 440', color: '#AA6768' },
- output: { name: '440' },
- },
- {
- check: false,
- module: {
- name: 'Re.RISE MS-G3 290',
- color: '#67A2AA',
- },
- output: { name: '240' },
- },
- ],
}
+ //체크된 모듈 데이터
+ useEffect(() => {
+ const checkedModuleIds = Object.keys(selectedItems).filter((key) => selectedItems[key])
+ const moduleArray = selectedModules.itemList.filter((item) => {
+ return checkedModuleIds.includes(item.itemId)
+ })
+ setCheckedModules(moduleArray)
+ }, [selectedItems])
+
const handleSetupLocation = (e) => {
initEvent()
refs.setupLocation.current = e.target
@@ -81,6 +80,20 @@ const PitchPlacement = forwardRef((props, refs) => {
}
}
+ useEffect(() => {
+ if (moduleSelectionData && moduleSelectionData.flatModule.itemList.length > 0) {
+ let initCheckedModule = {}
+ moduleSelectionData.flatModule.itemList.forEach((obj, index) => {
+ if (index === 0) {
+ initCheckedModule = { [obj.itemId]: true }
+ } else {
+ initCheckedModule = { ...initCheckedModule, [obj.itemId]: true }
+ }
+ })
+ setSelectedItems(initCheckedModule)
+ }
+ }, [])
+
return (
<>
@@ -150,8 +160,7 @@ const PitchPlacement = forwardRef((props, refs) => {
name="radio01"
id="ra01"
value={'south'}
- checked={setupLocation === 'south'}
- defaultChecked
+ defaultChecked={setupLocation === 'south'}
onClick={handleSetupLocation}
/>
@@ -162,7 +171,7 @@ const PitchPlacement = forwardRef((props, refs) => {
name="radio01"
id="ra02"
value={'excreta'}
- checked={setupLocation === 'excreta'}
+ defaultChecked={setupLocation === 'excreta'}
onClick={handleSetupLocation}
/>
diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
index 3783e033..1e989963 100644
--- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
@@ -1,7 +1,6 @@
import WithDraggable from '@/components/common/draggable/WithDraggable'
import { useState, useEffect, useContext } from 'react'
import PowerConditionalSelect from '@/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect'
-import CircuitAllocation from '@/components/floor-plan/modal/circuitTrestle/step/CircuitAllocation'
import StepUp from '@/components/floor-plan/modal/circuitTrestle/step/StepUp'
import { useMessage } from '@/hooks/useMessage'
import { usePopup } from '@/hooks/usePopup'
@@ -20,7 +19,11 @@ import { useTrestle } from '@/hooks/module/useTrestle'
import { selectedModuleState } from '@/store/selectedModuleOptions'
import { v4 as uuidv4 } from 'uuid'
-import { stepUpListDataState } from '@/store/circuitTrestleAtom'
+import { useEstimate } from '@/hooks/useEstimate'
+import { useCircuitTrestle } from '@/hooks/useCirCuitTrestle'
+import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
+import { useImgLoader } from '@/hooks/floorPlan/useImgLoader'
+import { usePlan } from '@/hooks/usePlan'
const ALLOCATION_TYPE = {
AUTO: 'auto',
@@ -29,52 +32,73 @@ const ALLOCATION_TYPE = {
export default function CircuitTrestleSetting({ id }) {
const { getMessage } = useMessage()
const { closePopup } = usePopup()
- const { apply } = useTrestle()
+ const { apply, setViewCircuitNumberTexts } = useTrestle()
const { swalFire } = useSwal()
+ const { saveEstimate } = useEstimate()
const canvas = useRecoilValue(canvasState)
- const [makers, setMakers] = useRecoilState(makersState)
- const [selectedMaker, setSelectedMaker] = useRecoilState(selectedMakerState)
- const [series, setSeries] = useRecoilState(seriesState)
- const [models, setModels] = useRecoilState(modelsState)
- const [selectedModels, setSelectedModels] = useRecoilState(selectedModelsState)
- const [pcsCheck, setPcsCheck] = useRecoilState(pcsCheckState)
-
const [tabNum, setTabNum] = useState(1)
const [allocationType, setAllocationType] = useState(ALLOCATION_TYPE.AUTO)
const [circuitAllocationType, setCircuitAllocationType] = useState(1)
const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
const selectedModules = useRecoilValue(selectedModuleState)
- const { getPcsAutoRecommendList, getPcsVoltageChk } = useMasterController()
+ const { getPcsAutoRecommendList, getPcsVoltageChk, getPcsVoltageStepUpList } = useMasterController()
// 회로할당(승합설정)에서 선택된 값들을 저장할 상태 추가
const [selectedStepUpValues, setSelectedStepUpValues] = useState({})
const [getStepUpSelections, setGetStepUpSelections] = useState(null)
+ // const { trigger: setCircuitData } = useCanvasPopupStatusController(4)
+ // const [stepUpListData, setStepUpListData] = useRecoilState(stepUpListDataState)
+ const [stepUpListData, setStepUpListData] = useState([])
+ const [seletedOption, setSeletedOption] = useState(null)
+ const { setModuleStatisticsData } = useCircuitTrestle()
- const [stepUpListData, setStepUpListData] = useRecoilState(stepUpListDataState)
+ const { handleCanvasToPng } = useImgLoader()
+ const { saveCanvas } = usePlan()
+ const {
+ makers,
+ setMakers,
+ selectedMaker,
+ setSelectedMaker,
+ series,
+ setSeries,
+ models,
+ setModels,
+ selectedModels,
+ setSelectedModels,
+ pcsCheck,
+ setPcsCheck,
+ getOptYn,
+ getPcsItemList,
+ getSelectedPcsItemList,
+ getUseModuleItemList,
+ getRoofSurfaceList,
+ getModuleList,
+ removeNotAllocationModules,
+ } = useCircuitTrestle()
+ // const { trigger: moduleSelectedDataTrigger } = useCanvasPopupStatusController(2)
useEffect(() => {
if (!managementState) {
setManagementState(managementStateLoaded)
}
+ // setCircuitData({
+ // makers,
+ // selectedMaker,
+ // series,
+ // models,
+ // selectedModels,
+ // pcsCheck,
+ // })
}, [])
- useEffect(() => {
- if (allocationType === ALLOCATION_TYPE.PASSIVITY && tabNum === 2) {
- const notAllocationModules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE && !obj.circuit)
- canvas.remove(...notAllocationModules)
- canvas.renderAll()
- }
- }, [tabNum])
-
- useEffect(() => {
- console.log('stepUpListData >>> ', stepUpListData)
- }, [stepUpListData])
+ // 수동할당 시 모듈 삭제
+ // 시리즈중 자동으로 추천 PCS 정보 조회
const onAutoRecommend = () => {
if (series.filter((s) => s.selected).length === 0) {
swalFire({
- title: '시리즈를 선택해 주세요.',
+ title: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.validation.error02'),
type: 'alert',
})
return
@@ -87,27 +111,45 @@ export default function CircuitTrestleSetting({ id }) {
pcsItemList: getPcsItemList(),
}
+ // 파워컨디셔너 추천 목록 조회
if (selectedModels.length === 0) {
+ // 시리즈중 자동으로 추천 PCS 정보 조회
getPcsAutoRecommendList(params).then((res) => {
if (res.data?.pcsItemList) {
- const itemList = models.filter((model) => {
- return res.data?.pcsItemList.map((item) => item.itemId).includes(model.itemId)
+ let pcsItemList = []
+ let pcsObj = {}
+
+ models.forEach((model) => {
+ pcsObj[model.itemId] = model
})
- const selectedModels = itemList.map((model) => {
- return {
- ...model,
- id: uuidv4(),
+ res.data?.pcsItemList.forEach((item) => {
+ if (pcsObj[item.itemId]) {
+ pcsItemList.push({
+ ...pcsObj[item.itemId],
+ isUsed: false,
+ id: uuidv4(),
+ })
}
})
+ // 회로 구성 가능 여부 체크 요청 파라미터
const pcsVoltageChkParams = {
...getOptYn(),
useModuleItemList: getUseModuleItemList(),
roofSurfaceList: getRoofSurfaceList(),
- pcsItemList: getPcsItemList(),
+ pcsItemList: pcsItemList,
}
- setSelectedModels(selectedModels)
+ // 추천 목록 선택
+ setSelectedModels(pcsItemList)
+ // 회로 구성 가능 여부 체크
getPcsVoltageChk(pcsVoltageChkParams).then((res) => {
- setTabNum(2)
+ if (res.resultCode === 'S') {
+ setTabNum(2)
+ } else {
+ swalFire({
+ title: res.resultMsg,
+ type: 'alert',
+ })
+ }
})
} else {
// 데이터가 없는 경우 오류 메시지 확인 필요
@@ -125,144 +167,37 @@ export default function CircuitTrestleSetting({ id }) {
}
})
} else {
- getPcsVoltageChk(params).then((res) => {
- setTabNum(2)
- })
- }
- }
-
- const getOptYn = () => {
- return {
- maxConnYn: pcsCheck.max ? 'Y' : 'N',
- smpCirYn: pcsCheck.division ? 'Y' : 'N',
- coldZoneYn: managementState?.coldRegionFlg === '1' ? 'Y' : 'N',
- }
- }
-
- const getPcsItemList = () => {
- return models.map((model) => {
- return {
- itemId: model.itemId,
- pcsMkrCd: model.pcsMkrCd,
- pcsSerCd: model.pcsSerCd,
- }
- })
- }
-
- const getUseModuleItemList = () => {
- return selectedModules.itemList.map((m) => {
- return {
- itemId: m.itemId,
- mixMatlNo: m.mixMatlNo,
- }
- })
- }
-
- const getRoofSurfaceList = () => {
- return canvas
- .getObjects()
- .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
- .map((obj) => {
- return {
- roofSurfaceId: obj.id,
- roofSurface: canvas
- .getObjects()
- .filter((o) => o.id === obj.parentId)[0]
- .directionText.replace(/[0-9]/g, ''),
- roofSurfaceIncl: canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch,
- moduleList: getModuleList(obj).map((module) => {
- return {
- itemId: module.moduleInfo.itemId,
- circuit: module.circuitNumber ? module.circuitNumber : null,
- pcsItemId: module.circuit ? module.circuit?.pcsItemId : null,
- uniqueId: module.id ? module.id : null,
- }
- }),
+ // 회로 구성 가능 여부 체크
+ getPcsVoltageChk({ ...params, pcsItemList: getSelectedPcsItemList() }).then((res) => {
+ if (res.resultCode === 'S') {
+ // 회로 구성 가능 여부 체크 통과 시 승압설정 정보 조회
+ getPcsVoltageStepUpList({
+ ...params,
+ pcsItemList: getSelectedPcsItemList(),
+ }).then((res) => {
+ setTabNum(2)
+ })
+ } else {
+ swalFire({
+ title: res.resultMsg,
+ type: 'alert',
+ })
}
})
- }
-
- const getModuleList = (surface) => {
- let moduleList = []
- let [xObj, yObj] = [{}, {}]
- let [xPoints, yPoints] = [[], []]
- surface.modules.forEach((module) => {
- if (!xObj[module.left]) {
- xObj[module.left] = module.left
- xPoints.push(module.left)
- }
- if (!yObj[module.top]) {
- yObj[module.top] = module.top
- yPoints.push(module.top)
- }
- })
- switch (surface.direction) {
- case 'south':
- xPoints.sort((a, b) => a - b)
- yPoints.sort((a, b) => b - a)
- yPoints.forEach((y, index) => {
- let temp = surface.modules.filter((m) => m.top === y)
- if (index % 2 === 0) {
- temp.sort((a, b) => a.left - b.left)
- } else {
- temp.sort((a, b) => b.left - a.left)
- }
- moduleList = [...moduleList, ...temp]
- })
- break
- case 'north':
- xPoints.sort((a, b) => b - a)
- yPoints.sort((a, b) => a - b)
- yPoints.forEach((y, index) => {
- let temp = surface.modules.filter((m) => m.top === y)
- if (index % 2 === 0) {
- temp.sort((a, b) => b.left - a.left)
- } else {
- temp.sort((a, b) => a.left - b.left)
- }
- moduleList = [...moduleList, ...temp]
- })
- break
- case 'west':
- xPoints.sort((a, b) => a - b)
- yPoints.sort((a, b) => a - b)
- xPoints.forEach((x, index) => {
- let temp = surface.modules.filter((m) => m.left === x)
- if (index % 2 === 0) {
- temp.sort((a, b) => a.top - b.top)
- } else {
- temp.sort((a, b) => b.top - a.top)
- }
- moduleList = [...moduleList, ...temp]
- })
- break
- case 'east':
- xPoints.sort((a, b) => b - a)
- yPoints.sort((a, b) => b - a)
- xPoints.forEach((x, index) => {
- let temp = surface.modules.filter((m) => m.left === x)
- if (index % 2 === 0) {
- temp.sort((a, b) => b.top - a.top)
- } else {
- temp.sort((a, b) => a.top - b.top)
- }
- moduleList = [...moduleList, ...temp]
- })
- break
- default:
- return []
}
- return moduleList
}
+ // 자동할당 버튼 클릭 시
const onAutoAllocation = () => {
let moduleStdQty = 0
let moduleMaxQty = 0
const selectedModels = models.filter((m) => m.selected)
+ // 시리즈중 자동으로 추천 PCS 정보 조회
if (selectedModels.length === 0) {
onAutoRecommend()
} else {
+ // 모듈 최소 매수
moduleStdQty = selectedModels.reduce((acc, model) => {
return acc + parseInt(model.moduleStdQty)
}, 0)
@@ -285,42 +220,71 @@ export default function CircuitTrestleSetting({ id }) {
// setTabNum(2)
}
+ // 수동할당 버튼 클릭 시
const onPassivityAllocation = () => {
if (selectedModels.length === 0) {
const params = {
...getOptYn(),
useModuleItemList: getUseModuleItemList(),
- roofSurfaceList: getRoofSurfaceList(),
+ roofSurfaceList: getRoofSurfaceList().map((surface) => {
+ return {
+ ...surface,
+ moduleList: surface.moduleList.map((module) => {
+ return {
+ itemId: module.itemId,
+ uniqueId: module.uniqueId,
+ }
+ }),
+ }
+ }),
pcsItemList: getPcsItemList(),
}
+ // 파워컨디셔너 추천 목록 조회
getPcsAutoRecommendList(params).then((res) => {
if (res.data?.pcsItemList) {
- const itemList = models.filter((model) => {
- return res.data?.pcsItemList.map((item) => item.itemId).includes(model.itemId)
+ let pcsItemList = []
+ let pcsObj = {}
+ models.forEach((model) => {
+ pcsObj[model.itemId] = model
})
- const selectedModels = itemList.map((model) => {
- return {
- ...model,
- id: uuidv4(),
+ res.data?.pcsItemList.forEach((item) => {
+ if (pcsObj[item.itemId]) {
+ pcsItemList.push({
+ ...pcsObj[item.itemId],
+ isUsed: false,
+ id: uuidv4(),
+ })
}
})
- const PcsVoltageChkParams = {
+ const pcsVoltageChkParams = {
...getOptYn(),
useModuleItemList: getUseModuleItemList(),
roofSurfaceList: getRoofSurfaceList(),
- pcsItemList: getPcsItemList(),
+ pcsItemList: pcsItemList.map((item) => {
+ return {
+ itemId: item.itemId,
+ pcsMkrCd: item.pcsMkrCd,
+ pcsSerCd: item.pcsSerCd,
+ }
+ }),
}
- setSelectedModels(selectedModels)
- getPcsVoltageChk(PcsVoltageChkParams).then((res) => {})
+ setSelectedModels(pcsItemList)
+ getPcsVoltageChk(pcsVoltageChkParams).then((res) => {
+ setAllocationType(ALLOCATION_TYPE.PASSIVITY)
+ })
} else {
swalFire({
- title: '파워컨디셔너를 추가해 주세요.',
+ title: res.result.resultMsg,
type: 'alert',
+ confirmFn: () => {
+ return
+ },
})
+ return
}
})
- } else if (pcsCheck.max) {
+ } else {
const moduleStdQty = selectedModels.reduce((acc, model) => {
return acc + parseInt(model.moduleStdQty)
}, 0)
@@ -333,14 +297,14 @@ export default function CircuitTrestleSetting({ id }) {
if (placementModules.length > target) {
swalFire({
- title: '배치가능 매수를 초과합니다. 파워컨디셔너를 다시 선택해 주세요.',
+ title: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.validation.error01'),
type: 'alert',
})
return
}
- }
- setAllocationType(ALLOCATION_TYPE.PASSIVITY)
+ setAllocationType(ALLOCATION_TYPE.PASSIVITY)
+ }
}
// StepUp에서 선택된 값들을 처리하는 함수 수정
@@ -358,83 +322,59 @@ export default function CircuitTrestleSetting({ id }) {
setGetStepUpSelections(() => getCurrentSelections)
}
- // apply 함수 수정
- const onApply = () => {
- // 현재 선택된 값들 가져오기
- const currentSelections = getStepUpSelections ? getStepUpSelections() : {}
-
- console.log('currentSelections >>> ', currentSelections)
-
- // 실제 선택된 값이 있는지 더 정확하게 확인
- const hasSelections = Object.values(currentSelections).some((stepUpConfig) => Object.values(stepUpConfig).length > 0)
-
- console.log('hasSelections >>> ', hasSelections)
-
- if (!hasSelections) {
- swalFire({
- title: '승압 설정값을 선택해주세요.1',
- type: 'alert',
- })
- return
- }
-
- // 선택된 값들 로그
- console.log('Applying StepUp configurations:', currentSelections)
-
- // StepUp 컴포넌트로부터 stepUpListData 받아오기
- //const stepUpData = getStepUpSelections().stepUpListData
- //console.log('stepUpData >>> ', stepUpData)
- // stepUpListData를 Recoil state에 저장
- // setStepUpListData(stepUpData)
-
- // 선택된 값들을 배열로 변환하여 처리
- const configurations = Object.values(currentSelections)
- .map((stepUpConfig) => {
- const firstConfig = Object.values(stepUpConfig)[0] // 첫 번째 설정만 사용
- return {
- pcsInfo: firstConfig.pcsInfo,
- allocation: firstConfig.allocation,
- }
- })
- .filter((config) => config.pcsInfo && config.allocation) // 유효한 설정만 필터링
-
- console.log('Processed configurations:', configurations)
-
- // stepUpListData를 Recoil state에 저장
- setStepUpListData(configurations)
-
- // 기존 apply 로직 실행 전에 필요한 데이터가 모두 있는지 확인
- if (configurations.length > 0) {
- apply()
- } else {
- swalFire({
- title: '승압 설정값을 선택해주세요.2',
- type: 'alert',
+ // 회로할당(승압설정) 저장 버튼 클릭 시
+ const onApply = async () => {
+ canvas
+ .getObjects()
+ .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
+ .map((obj) => {
+ obj.pcses = getStepUpListData()
})
+
+ setViewCircuitNumberTexts(false)
+
+ handleCanvasToPng(1)
+
+ const result = await apply()
+ if (result) {
+ handleCanvasToPng(2)
+ setViewCircuitNumberTexts(true)
+ // 캔버스 저장
+ await saveCanvas(false)
+ // 견적서 저장
+ await saveEstimate(result)
}
+ // removeNotAllocationModules()
}
+ // 이전 버튼 클릭 시
const onClickPrev = () => {
- setAllocationType(ALLOCATION_TYPE.AUTO)
+ // setAllocationType(ALLOCATION_TYPE.AUTO)
swalFire({
- text: '할당한 회로 번호가 초기화됩니다.',
+ text: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset.info'),
type: 'alert',
icon: 'warning',
confirmFn: () => {
- const circuitModules = canvas
- .getObjects()
- .filter((obj) => obj.name === 'module' && selectedModels.map((model) => model.id).includes(obj.circuit?.circuitInfo?.id))
+ const circuitModules = canvas.getObjects().filter((obj) => obj.name === 'module')
canvas.remove(...circuitModules.map((module) => module.circuit))
circuitModules.forEach((obj) => {
obj.circuit = null
obj.pcsItemId = null
})
- setAllocationType(ALLOCATION_TYPE.AUTO)
+
+ if (allocationType === ALLOCATION_TYPE.PASSIVITY) {
+ setAllocationType(ALLOCATION_TYPE.AUTO)
+ } else {
+ setTabNum(1)
+ }
+
canvas.renderAll()
+ setModuleStatisticsData()
},
})
}
+ // 파워컨디셔너 컴포넌트 속성
const powerConditionalSelectProps = {
tabNum,
setTabNum,
@@ -449,8 +389,10 @@ export default function CircuitTrestleSetting({ id }) {
selectedModels,
setSelectedModels,
managementState,
+ getUseModuleItemList,
}
+ // 수동할당 컴포넌트 속성
const passivityProps = {
tabNum,
setTabNum,
@@ -462,18 +404,86 @@ export default function CircuitTrestleSetting({ id }) {
getRoofSurfaceList,
}
+ // 승압설정 컴포넌트 속성
const stepUpProps = {
tabNum,
setTabNum,
models,
setModels,
+ allocationType,
circuitAllocationType,
setCircuitAllocationType,
+ selectedModels,
+ setSelectedModels,
+ getSelectedPcsItemList,
getOptYn, // 옵션 Y/N
getUseModuleItemList, // 사용된 모듈아이템 List
getRoofSurfaceList, // 지붕면 목록
getPcsItemList, // PCS 아이템 목록
onValuesSelected: handleStepUpValuesSelected, // 선택된 값들을 처리하는 함수
+ stepUpListData,
+ setStepUpListData,
+ seletedOption,
+ setSeletedOption,
+ getModuleList,
+ }
+
+ // 승압설정 목록 조회
+ const getStepUpListData = () => {
+ return stepUpListData[0].pcsItemList.map((item) => {
+ return item.serQtyList
+ .filter((serQty) => serQty.selected)
+ .map((serQty) => {
+ return {
+ pcsMkrCd: item.pcsMkrCd,
+ pcsSerCd: item.pcsSerCd,
+ pcsItemId: item.itemId,
+ pscOptCd: seletedOption.code,
+ paralQty: serQty.paralQty,
+ connections: item.connList?.length
+ ? [
+ {
+ connItemId: item.connList[0].itemId,
+ },
+ ]
+ : [],
+ }
+ })[0]
+ })
+ }
+
+ const handleStepUp = () => {
+ const notAllocationModules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE && !obj.circuit)
+ if (notAllocationModules.length > 0) {
+ swalFire({
+ title: getMessage('not.allocation.exist.module'),
+ type: 'alert',
+ confirmFn: () => {},
+ })
+ return
+ // canvas.remove(...notAllocationModules)
+ // canvas.renderAll()
+ }
+ setTabNum(2)
+ }
+
+ // 닫기 버튼 클릭 시 처리하는 함수 추가
+ const handleClose = () => {
+ // // 회로 번호 텍스트 제거
+ const circuitTexts = canvas.getObjects().filter((obj) => obj.name === 'circuitNumber')
+ canvas.remove(...circuitTexts)
+ // 모듈의 회로 정보 초기화
+ canvas
+ .getObjects()
+ .filter((obj) => obj.name === POLYGON_TYPE.MODULE)
+ .forEach((obj) => {
+ obj.circuit = null
+ obj.pcsItemId = null
+ obj.circuitNumber = null
+ })
+
+ canvas.renderAll()
+ closePopup(id)
}
return (
@@ -481,7 +491,8 @@ export default function CircuitTrestleSetting({ id }) {
{getMessage('modal.circuit.trestle.setting')}
-
@@ -498,7 +509,7 @@ export default function CircuitTrestleSetting({ id }) {
{tabNum === 2 && }
{tabNum === 1 && allocationType === ALLOCATION_TYPE.AUTO && (
- |