배치면초기설정 조회/저장 작업 중

This commit is contained in:
changkyu choi 2024-12-24 18:10:29 +09:00
parent afea0f7c30
commit 66f0357fe0
3 changed files with 60 additions and 66 deletions

View File

@ -23,8 +23,6 @@ import QInput from './common/input/Qinput'
import QSelect from './common/select/QSelect'
import QPagination from './common/pagination/QPagination'
import { trestleRequestModels, constructionRequestModels, trestleDetailRequestModels } from '@/models/apiModels'
export default function Playground() {
const [useCadFile, setUseCadFile] = useRecoilState(useCadFileState)
const [cadFileName, setCadFileName] = useRecoilState(cadFileNameState)
@ -50,51 +48,8 @@ export default function Playground() {
const [users, setUsers] = useState([])
const [trestleRequestData, setTrestleRequestData] = useState(trestleRequestModels)
const [constructionRequestData, setConstructionRequestData] = useState(constructionRequestModels)
const [trestleDetailRequestData, setTrestleDetailRequestData] = useState(trestleDetailRequestModels)
useEffect(() => {
console.log('textInput:', textInput)
setTrestleRequestData({
moduleTpCd: '',
roofMatlCd: '',
raftBaseCd: '',
trestleMkrCd: '',
constMthdCd: '',
roofBaseCd: '',
})
setConstructionRequestData({
moduleTpCd: 'testData_1',
roofMatlCd: 'testData_2',
trestleMkrCd: 'testData_3',
constMthdCd: 'testData_4',
roofBaseCd: 'testData_5',
illuminationTp: 'testData_6',
instHt: 'testData_7',
stdWindSpeed: 'testData_8',
stdSnowLd: 'testData_9',
inclCd: 'testData_10',
raftBaseCd: 'testData_11',
roofPitch: 30,
})
setTrestleDetailRequestData({
moduleTpCd: 'testData_1',
roofMatlCd: 'testData_2',
trestleMkrCd: 'testData_3',
constMthdCd: 'testData_4',
roofBaseCd: 'testData_5',
illuminationTp: 'testData_6',
instHt: 'testData_7',
stdWindSpeed: 'testData_8',
stdSnowLd: 'testData_9',
inclCd: 'testData_10',
constTp: 'testData_11',
mixMatlNo: 10,
roofPitch: 20,
})
}, [textInput])
useEffect(() => {
console.log('numberInput:', numberInput)
@ -223,7 +178,7 @@ export default function Playground() {
<button
className="btn-frame deepgray"
onClick={() => {
getTrestleList(trestleRequestData)
getTrestleList({moduleTpCd: '', roofMatlCd: '', raftBaseCd: '', trestleMkrCd: '', constMthdCd: '', roofBaseCd: '',}) //
}}
>
가대 목록 조회 API 호출
@ -231,7 +186,20 @@ export default function Playground() {
<button
className="btn-frame deepgray"
onClick={() => {
getConstructionList(constructionRequestData)
getConstructionList({ //
moduleTpCd: 'testData_1',
roofMatlCd: 'testData_2',
trestleMkrCd: 'testData_3',
constMthdCd: 'testData_4',
roofBaseCd: 'testData_5',
illuminationTp: 'testData_6',
instHt: 'testData_7',
stdWindSpeed: 'testData_8',
stdSnowLd: 'testData_9',
inclCd: 'testData_10',
raftBaseCd: '',
roofPitch: 30,
})
}}
>
시공법 목록 조회 API 호출
@ -239,7 +207,21 @@ export default function Playground() {
<button
className="btn-frame deepgray"
onClick={() => {
getTrestleDetailList(trestleDetailRequestData)
getTrestleDetailList({ //
moduleTpCd: 'testData_1',
roofMatlCd: 'testData_2',
trestleMkrCd: 'testData_3',
constMthdCd: 'testData_4',
roofBaseCd: 'testData_5',
illuminationTp: 'testData_6',
instHt: 'testData_7',
stdWindSpeed: 'testData_8',
stdSnowLd: 'testData_9',
inclCd: 'testData_10',
constTp: 'testData_11',
mixMatlNo: 30,
roofPitch: 0,
})
}}
>
가대 상세 조회 API 호출

View File

@ -28,9 +28,9 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
const { basicSetting, setBasicSettings, fetchBasicSettings, basicSettingSave } = useCanvasSetting()
const { findCommonCode } = useCommonCode()
const [raftCodes, setRaftCodes] = useState([])
const [currentRoofMaterial, setCurrentRoofMaterial] = useState(basicSetting.selectedRoofMaterial)
const [roofLayout, setRoofLayout] = useState(basicSetting.selectedRoofMaterial.layout)
//const [currentRoofMaterial, setCurrentRoofMaterial] = useState(basicSetting.selectedRoofMaterial)
const [currentRoofMaterial, setCurrentRoofMaterial] = useState(basicSetting.roofs[0]) //
const [roofLayout, setRoofLayout] = useState(basicSetting.roofs[0].layout) //
const roofRef = {
roofCd: useRef(null),
@ -49,8 +49,11 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
useEffect(() => {
console.log('currentRoofMaterial', currentRoofMaterial)
console.log('basicSetting', basicSetting)
//console.log('currentRoofMaterial >>>>>>>>>>>>>>>>>>> ', currentRoofMaterial)
console.log(' basicSetting.roofs[0] >>>>>>>>>>>>>>>>>>> ', basicSetting.roofs[0])
//console.log('basicSetting >>>>>>>>>>>>>>>>>>> ', basicSetting)
console.log('roofLayout >>>>>>>>>>>>>>>>>>> ', roofLayout)
setBasicSettings({
...basicSetting,
@ -70,6 +73,7 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
// Function to update the roofType and corresponding values
const handleRoofTypeChange = (value) => {
const selectedRoofMaterial = roofMaterials.find((roof) => roof.roofMatlCd === value)
console.log('selectedRoofMaterial >>>>>>>>>>>>>>>>>>> ', selectedRoofMaterial)
setRoofLayout(selectedRoofMaterial.layout)
setCurrentRoofMaterial(selectedRoofMaterial)
}

View File

@ -120,7 +120,6 @@ export function useCanvasSetting() {
}
const { id } = selectedRoofMaterial
//console.log('id', id)
if (id !== undefined) console.log(getModuleTypeItemList(id))
}, [selectedRoofMaterial])
@ -266,7 +265,7 @@ export function useCanvasSetting() {
let roofsRow = {}
let roofsArray = {}
if (res) {
if (res.length > 0) {
roofsRow = res.map((item) => {
return {
roofSizeSet: item.roofSizeSet,
@ -289,12 +288,12 @@ export function useCanvasSetting() {
} else {
roofsRow = {
roofsRow = [{
roofSizeSet: 1,
roofAngleSet: 'slope',
}
}]
roofsArray = {
roofsArray = [{
roofApply: true,
roofSeq: 1,
roofMatlCd: 'ROOF_ID_WA_53A',
@ -303,11 +302,8 @@ export function useCanvasSetting() {
roofHajebichi: 0,
roofGap: 'HEI_455',
roofLayout: 'P',
}]
}
}
console.log('roofsRow ', roofsRow)
console.log('roofsArray ', roofsArray)
// 나머지 데이터와 함께 'roofs' 배열을 patternData에 넣음
const patternData = {
@ -319,7 +315,19 @@ export function useCanvasSetting() {
console.log('patternData', patternData)
// 데이터 설정
setBasicSettings({ ...basicSetting, roofSizeSet: roofsRow[0].roofSizeSet, roofAngleSet: roofsRow[0].roofAngleSet, roofsData: roofsArray})
//setBasicSettings({ ...basicSetting, roofSizeSet: roofsRow[0].roofSizeSet, roofAngleSet: roofsRow[0].roofAngleSet, roofsData: roofsArray})
const addRoofs = []
roofMaterials.map((material) => {
if (material.id === roofsArray[0].roofMatlCd) {
//setRoofMaterials({ ...roofMaterials, layout: roofsArray[0].roofLayout })
addRoofs.push({ ...material, selected: true, layout: roofsArray[0].roofLayout })
setBasicSettings({ ...basicSetting, roofMaterials: material
, roofs: addRoofs
, roofSizeSet: roofsRow[0].roofSizeSet
, roofAngleSet: roofsRow[0].roofAngleSet
, roofsData: roofsArray })
}
})
})
} catch (error) {