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-05 14:31:19 +09:00
commit af692e56cc
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
View File

@ -522,11 +522,13 @@ export default function CircuitTrestleSetting({ id }) {
pcsItemId: item.itemId, pcsItemId: item.itemId,
pscOptCd: seletedOption.code, pscOptCd: seletedOption.code,
paralQty: serQty.paralQty, paralQty: serQty.paralQty,
connections: [ connections: item.connList?.length
{ ? [
connItemId: item.connList[0].itemId, {
}, connItemId: item.connList[0].itemId,
], },
]
: [],
} }
})[0] })[0]
}) })
@ -534,23 +536,6 @@ export default function CircuitTrestleSetting({ id }) {
// 닫기 버튼 클릭 시 처리하는 함수 추가 // 닫기 버튼 클릭 시 처리하는 함수 추가
const handleClose = () => { 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)
swalFire({ swalFire({
title: '변경사항을 저장하시겠습니까?', title: '변경사항을 저장하시겠습니까?',
//text: '저장하지 않은 변경사항은 모두 사라집니다.', //text: '저장하지 않은 변경사항은 모두 사라집니다.',

5
src/components/management/StuffSearchCondition.jsx
View File

@ -87,6 +87,7 @@ export default function StuffSearchCondition() {
} }
setIsGlobalLoading(true) setIsGlobalLoading(true)
if (stuffSearch.code === 'S') { if (stuffSearch.code === 'S') {
if (stuffSearch.pageNo !== 1) { if (stuffSearch.pageNo !== 1) {
setStuffSearch({ setStuffSearch({
@ -119,7 +120,7 @@ export default function StuffSearchCondition() {
schAddress: address ? address.trim() : '', schAddress: address ? address.trim() : '',
schObjectName: objectName ? objectName.trim() : '', schObjectName: objectName ? objectName.trim() : '',
schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '',
schSelSaleStoreId: schSelSaleStoreId ? schSelSaleStoreId : stuffSearch.schSelSaleStoreId, schSelSaleStoreId: '',
schOtherSelSaleStoreId: otherSaleStoreId ? otherSaleStoreId : stuffSearch.schOtherSelSaleStoreId, schOtherSelSaleStoreId: otherSaleStoreId ? otherSaleStoreId : stuffSearch.schOtherSelSaleStoreId,
schReceiveUser: receiveUser ? receiveUser.trim() : '', schReceiveUser: receiveUser ? receiveUser.trim() : '',
schDateType: dateType, schDateType: dateType,
@ -209,7 +210,7 @@ export default function StuffSearchCondition() {
schAddress: address ? address.trim() : '', schAddress: address ? address.trim() : '',
schObjectName: objectName ? objectName.trim() : '', schObjectName: objectName ? objectName.trim() : '',
schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '',
schSelSaleStoreId: myDataCheck ? schSelSaleStoreId : otherSaleStoreId ? schSelSaleStoreId : '', schSelSaleStoreId: myDataCheck ? '' : otherSaleStoreId ? '' : '',
schOtherSelSaleStoreId: myDataCheck ? '' : otherSaleStoreId, schOtherSelSaleStoreId: myDataCheck ? '' : otherSaleStoreId,
schReceiveUser: receiveUser ? receiveUser.trim() : '', schReceiveUser: receiveUser ? receiveUser.trim() : '',
schDateType: dateType, schDateType: dateType,