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-02-06 17:46:07 +09:00
commit 17d34bb036
32 changed files with 939 additions and 643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.development
View File

@ -1,10 +1,11 @@
NEXT_PUBLIC_API_SERVER_PATH="http://1.248.227.176:38080" NEXT_PUBLIC_API_SERVER_PATH="http://1.248.227.176:38080"
NEXT_PUBLIC_HOST_URL="http://localhost:4000" NEXT_PUBLIC_HOST_URL="http://1.248.227.176:4000"
SESSION_SECRET="i3iHH1yp2/2SpQSIySQ4bpyc4g0D+zCF9FAn5xUG0+Y=" SESSION_SECRET="i3iHH1yp2/2SpQSIySQ4bpyc4g0D+zCF9FAn5xUG0+Y="
NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_bV5zuYMyyIYFlOb3" # NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_bV5zuYMyyIYFlOb3"
NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_yAS4QDalL9jgQ7vS"
NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="http://q-order-stg.q-cells.jp:8120/eos/login/autoLogin" NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="http://q-order-stg.q-cells.jp:8120/eos/login/autoLogin"
NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="http://q-musubi-stg.q-cells.jp:8120/qm/login/autoLogin" NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="http://q-musubi-stg.q-cells.jp:8120/qm/login/autoLogin"

5
.env.production
View File

@ -1,10 +1,11 @@
NEXT_PUBLIC_API_SERVER_PATH="http://1.248.227.176:38080" NEXT_PUBLIC_API_SERVER_PATH="http://1.248.227.176:38080"
NEXT_PUBLIC_HOST_URL="http://localhost:4000" NEXT_PUBLIC_HOST_URL="http://1.248.227.176:4000"
SESSION_SECRET="i3iHH1yp2/2SpQSIySQ4bpyc4g0D+zCF9FAn5xUG0+Y=" SESSION_SECRET="i3iHH1yp2/2SpQSIySQ4bpyc4g0D+zCF9FAn5xUG0+Y="
NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_bV5zuYMyyIYFlOb3" # NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_bV5zuYMyyIYFlOb3"
NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_yAS4QDalL9jgQ7vS"
NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="https://q-order.q-cells.jp/eos/login/autoLogin" NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="https://q-order.q-cells.jp/eos/login/autoLogin"
NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="https://q-musubi.q-cells.jp/qm/login/autoLogin" NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="https://q-musubi.q-cells.jp/qm/login/autoLogin"

24
src/components/auth/AutoLogin.jsx
View File

@ -1,21 +1,27 @@
'use client' 'use client'
import { useState } from 'react'
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
import GlobalSpinner from '@/components/common/spinner/GlobalSpinner'
export default function AutoLoginPage() { export default function AutoLoginPage() {
const [isLoading, setIsLoading] = useState(true)
const { getMessage } = useMessage() const { getMessage } = useMessage()
return ( return (
<div className="login-input-frame"> <>
<div className="login-frame-tit "> {isLoading && <GlobalSpinner />}
<span>{getMessage('site.name')}</span> <div className="login-input-frame">
{getMessage('site.sub_name')} <div className="login-frame-tit ">
</div> <span>{getMessage('site.name')}</span>
<div className="login-input-wrap"> {getMessage('site.sub_name')}
<div className="login-area id" style={{ fontWeight: 'bolder' }}> </div>
{getMessage('login.auto.page.text')} <div className="login-input-wrap">
<div className="login-area id" style={{ fontWeight: 'bolder' }}>
{getMessage('login.auto.page.text')}
</div>
</div> </div>
</div> </div>
</div> </>
) )
} }

299
src/components/auth/Login.jsx
View File

@ -10,14 +10,15 @@ import { useMessage } from '@/hooks/useMessage'
import { globalLocaleStore } from '@/store/localeAtom' import { globalLocaleStore } from '@/store/localeAtom'
import { sessionStore } from '@/store/commonAtom' import { sessionStore } from '@/store/commonAtom'
import { useRouter } from 'next/navigation' import { useRouter } from 'next/navigation'
import Cookies from 'js-cookie'
import { useSearchParams } from 'next/navigation' import { useSearchParams } from 'next/navigation'
import GlobalSpinner from '@/components/common/spinner/GlobalSpinner'
import Cookies from 'js-cookie'
import AutoLogin from './AutoLogin' import AutoLogin from './AutoLogin'
export default function Login() { export default function Login() {
const [isLoading, setIsLoading] = useState(false)
// 자동 로그인 // 자동 로그인
const initParams = useSearchParams() const initParams = useSearchParams()
const autoLoginParam = initParams.get('autoLoginParam1') const autoLoginParam = initParams.get('autoLoginParam1')
@ -35,11 +36,13 @@ export default function Login() {
}, []) }, [])
const autoLoginProcess = async (autoLoginParam) => { const autoLoginProcess = async (autoLoginParam) => {
setIsLoading(true)
await promisePost({ url: '/api/login/v1.0/user/login/autoLoginDecryptData', data: { loginId: autoLoginParam } }) await promisePost({ url: '/api/login/v1.0/user/login/autoLoginDecryptData', data: { loginId: autoLoginParam } })
.then((res) => { .then((res) => {
if (res) { if (res) {
if (res.data) { if (res.data) {
post({ url: '/api/login/v1.0/user', data: { loginId: res.data } }).then((response) => { post({ url: '/api/login/v1.0/user', data: { loginId: res.data } }).then((response) => {
setIsLoading(false)
if (response) { if (response) {
const result = { ...response, storeLvl: response.groupId === '60000' ? '1' : '2', pwdInitYn: 'Y' } const result = { ...response, storeLvl: response.groupId === '60000' ? '1' : '2', pwdInitYn: 'Y' }
setSession(result) setSession(result)
@ -53,6 +56,7 @@ export default function Login() {
} }
}) })
.catch((error) => { .catch((error) => {
setIsLoading(false)
router.push('/login') router.push('/login')
}) })
} }
@ -93,9 +97,11 @@ export default function Login() {
loginId: formData.get('id'), loginId: formData.get('id'),
pwd: formData.get('password'), pwd: formData.get('password'),
} }
setIsLoading(true)
await promisePost({ url: '/api/login/v1.0/login', data: param }) await promisePost({ url: '/api/login/v1.0/login', data: param })
.then((res) => { .then((res) => {
if (res) { if (res) {
setIsLoading(false)
if (res.data.result.resultCode === 'S') { if (res.data.result.resultCode === 'S') {
setSession(res.data.data) setSession(res.data.data)
setSessionState(res.data.data) setSessionState(res.data.data)
@ -105,7 +111,6 @@ export default function Login() {
} else { } else {
Cookies.remove('chkLoginId') Cookies.remove('chkLoginId')
} }
// router.push('/')
login() login()
} else { } else {
alert(res.data.result.resultMsg) alert(res.data.result.resultMsg)
@ -113,6 +118,7 @@ export default function Login() {
} }
}) })
.catch((error) => { .catch((error) => {
setIsLoading(false)
alert(error.response.data.message) alert(error.response.data.message)
}) })
} }
@ -123,12 +129,14 @@ export default function Login() {
loginId: checkId, loginId: checkId,
email: checkEmail, email: checkEmail,
} }
setIsLoading(true)
await promisePatch({ await promisePatch({
url: '/api/login/v1.0/user/init-password', url: '/api/login/v1.0/user/init-password',
data: param, data: param,
}) })
.then((res) => { .then((res) => {
if (res) { if (res) {
setIsLoading(false)
if (res.data.result.resultCode == 'S') { if (res.data.result.resultCode == 'S') {
alert(getMessage('login.init_password.complete_message')) alert(getMessage('login.init_password.complete_message'))
setCheckId('') setCheckId('')
@ -140,36 +148,135 @@ export default function Login() {
} }
}) })
.catch((error) => { .catch((error) => {
setIsLoading(false)
alert(error.response.data.message) alert(error.response.data.message)
}) })
} }
return ( return (
<div className="login-wrap"> <>
<div className="login-inner"> {isLoading && <GlobalSpinner />}
<Link href={'/login'} className="login-logo"> <div className="login-wrap">
<Image src="/static/images/main/login-logo.svg" alt="react" width={236} height={43} styles={{ width: '236px', height: '43px' }} priority /> <div className="login-inner">
</Link> <Link href={'/login'} className="login-logo">
{!autoLoginParam && passwordReset === 1 && ( <Image
<> src="/static/images/main/login-logo.svg"
<div className="login-input-frame"> alt="react"
<form onSubmit={loginProcess} className="space-y-6"> width={236}
<div className="login-frame-tit"> height={43}
<span>{getMessage('site.name')}</span> styles={{ width: '236px', height: '43px' }}
{getMessage('site.sub_name')} priority
/>
</Link>
{!autoLoginParam && passwordReset === 1 && (
<>
<div className="login-input-frame">
<form onSubmit={loginProcess} className="space-y-6">
<div className="login-frame-tit">
<span>{getMessage('site.name')}</span>
{getMessage('site.sub_name')}
</div>
<div className="login-input-wrap">
<div className={`login-area id ${idFocus ? 'focus' : ''}`}>
<input
type="text"
className="login-input"
id="userId"
name="id"
required
value={userId}
placeholder={getMessage('login.id.placeholder')}
onChange={(e) => {
setUserId(e.target.value)
}}
onFocus={() => setIdFocus(true)}
onBlur={() => setIdFocus(false)}
/>
<button
type="button"
className="id-delete"
onClick={(e) => {
setUserId('')
}}
></button>
</div>
<div className={`login-area password ${secFocus ? 'focus' : ''}`}>
<input
type={passwordVisible ? 'text' : 'password'}
className="login-input"
id="password"
name="password"
required
autoComplete="current-password"
placeholder={getMessage('login.password.placeholder')}
onChange={(e) => {
setPasswordVisible(passwordVisible)
}}
onFocus={() => setSecFocus(true)}
onBlur={() => setSecFocus(false)}
/>
<button
type="button"
className={`password-hidden ${passwordVisible ? 'visible' : ''}`}
onClick={(e) => {
e.preventDefault()
setPasswordVisible(!passwordVisible)
}}
></button>
</div>
<div className="d-check-box login">
<input
type="checkbox"
id="ch01"
name="chkLoginId"
checked={chkLoginId}
onChange={(e) => {
setChkLoginId(e.target.checked)
}}
/>
<label htmlFor="ch01">{getMessage('login.id.save')}</label>
</div>
<div className="login-btn-box">
<button type="submit" className="login-btn">
{getMessage('login')}
</button>
</div>
<div className="reset-password">
<button type="button" onClick={() => setPasswordReset(2)}>
{getMessage('login.init_password.btn')}
</button>
</div>
</div>
</form>
</div>
<div className="login-guide-wrap">
<span>※</span>
{getMessage('login.guide.text')}
<br />
{getMessage('login.guide.sub1')} <Link href={'../join'}>{getMessage('login.guide.join.btn')}</Link>
{getMessage('login.guide.sub2')}
</div>
</>
)}
{!autoLoginParam && passwordReset === 2 && (
<>
<div className="login-input-frame">
<div className="login-frame-tit pw-reset">
<span>{getMessage('login.init_password.title')}</span>
{getMessage('login.init_password.sub_title')}
</div> </div>
<div className="login-input-wrap"> <div className="login-input-wrap">
<div className={`login-area id ${idFocus ? 'focus' : ''}`}> <div className={`login-area id ${idFocus ? 'focus' : ''}`}>
<input <input
type="text" type="text"
className="login-input" id="checkId"
id="userId" name="checkId"
name="id" value={checkId}
required required
value={userId} className="login-input"
placeholder={getMessage('login.id.placeholder')} placeholder={getMessage('login.init_password.id.placeholder')}
onChange={(e) => { onChange={(e) => {
setUserId(e.target.value) setCheckId(e.target.value)
}} }}
onFocus={() => setIdFocus(true)} onFocus={() => setIdFocus(true)}
onBlur={() => setIdFocus(false)} onBlur={() => setIdFocus(false)}
@ -177,146 +284,58 @@ export default function Login() {
<button <button
type="button" type="button"
className="id-delete" className="id-delete"
onClick={(e) => { onClick={() => {
setUserId('') setCheckId('')
}} }}
></button> ></button>
</div> </div>
<div className={`login-area password ${secFocus ? 'focus' : ''}`}> <div className={`login-area email ${secFocus ? 'focus' : ''}`}>
<input <input
type={passwordVisible ? 'text' : 'password'} id="checkEmail"
className="login-input" name="checkEmail"
id="password" type="email"
name="password"
required required
autoComplete="current-password" className="login-input"
placeholder={getMessage('login.password.placeholder')} value={checkEmail}
onChange={(e) => { onChange={(e) => {
setPasswordVisible(passwordVisible) setCheckEmail(e.target.value)
}} }}
placeholder={getMessage('login.init_password.email.placeholder')}
onFocus={() => setSecFocus(true)} onFocus={() => setSecFocus(true)}
onBlur={() => setSecFocus(false)} onBlur={() => setSecFocus(false)}
/> />
<button <button
type="button" type="button"
className={`password-hidden ${passwordVisible ? 'visible' : ''}`} className="id-delete"
onClick={(e) => { onClick={() => {
e.preventDefault() setCheckEmail('')
setPasswordVisible(!passwordVisible)
}} }}
></button> ></button>
</div> </div>
<div className="d-check-box login"> <div className="pwreset-btn-box">
<input <button
type="checkbox" type="button"
id="ch01" className="login-btn light mr5"
name="chkLoginId" onClick={() => {
checked={chkLoginId} setPasswordReset(1)
onChange={(e) => { setCheckEmail('')
setChkLoginId(e.target.checked) setCheckId('')
}} }}
/> >
<label htmlFor="ch01">{getMessage('login.id.save')}</label> {getMessage('login.init_password.btn.back')}
</div>
<div className="login-btn-box">
<button type="submit" className="login-btn">
{getMessage('login')}
</button> </button>
</div> <button type="button" className="login-btn" onClick={initPasswordProcess}>
<div className="reset-password">
<button type="button" onClick={() => setPasswordReset(2)}>
{getMessage('login.init_password.btn')} {getMessage('login.init_password.btn')}
</button> </button>
</div> </div>
</div> </div>
</form>
</div>
<div className="login-guide-wrap">
<span>※</span>
{getMessage('login.guide.text')}
<br />
{getMessage('login.guide.sub1')} <Link href={'../join'}>{getMessage('login.guide.join.btn')}</Link>
{getMessage('login.guide.sub2')}
</div>
</>
)}
{!autoLoginParam && passwordReset === 2 && (
<>
<div className="login-input-frame">
<div className="login-frame-tit pw-reset">
<span>{getMessage('login.init_password.title')}</span>
{getMessage('login.init_password.sub_title')}
</div> </div>
<div className="login-input-wrap"> </>
<div className={`login-area id ${idFocus ? 'focus' : ''}`}> )}
<input {autoLoginParam && <AutoLogin />}
type="text" </div>
id="checkId" <div className="login-copyright">COPYRIGHT©2024 Hanwha Japan All Rights Reserved.</div>
name="checkId"
value={checkId}
required
className="login-input"
placeholder={getMessage('login.init_password.id.placeholder')}
onChange={(e) => {
setCheckId(e.target.value)
}}
onFocus={() => setIdFocus(true)}
onBlur={() => setIdFocus(false)}
/>
<button
type="button"
className="id-delete"
onClick={() => {
setCheckId('')
}}
></button>
</div>
<div className={`login-area email ${secFocus ? 'focus' : ''}`}>
<input
id="checkEmail"
name="checkEmail"
type="email"
required
className="login-input"
value={checkEmail}
onChange={(e) => {
setCheckEmail(e.target.value)
}}
placeholder={getMessage('login.init_password.email.placeholder')}
onFocus={() => setSecFocus(true)}
onBlur={() => setSecFocus(false)}
/>
<button
type="button"
className="id-delete"
onClick={() => {
setCheckEmail('')
}}
></button>
</div>
<div className="pwreset-btn-box">
<button
type="button"
className="login-btn light mr5"
onClick={() => {
setPasswordReset(1)
setCheckEmail('')
setCheckId('')
}}
>
{getMessage('login.init_password.btn.back')}
</button>
<button type="button" className="login-btn" onClick={initPasswordProcess}>
{getMessage('login.init_password.btn')}
</button>
</div>
</div>
</div>
</>
)}
{autoLoginParam && <AutoLogin />}
</div> </div>
<div className="login-copyright">COPYRIGHT©2024 Hanwha Japan All Rights Reserved.</div> </>
</div>
) )
} }

11
src/components/estimate/Estimate.jsx
View File

@ -1188,7 +1188,7 @@ export default function Estimate({}) {
<input <input
type="text" type="text"
className="input-light" className="input-light"
value={estimateContextState?.charger} value={estimateContextState?.charger || ''}
onBlur={handleBlurCharger} onBlur={handleBlurCharger}
onChange={handleBlurCharger} onChange={handleBlurCharger}
/> />
@ -1206,7 +1206,7 @@ export default function Estimate({}) {
<input <input
type="text" type="text"
className="input-light" className="input-light"
value={estimateContextState?.objectName} value={estimateContextState?.objectName || ''}
onBlur={handleBlurObjectName} onBlur={handleBlurObjectName}
onChange={handleBlurObjectName} onChange={handleBlurObjectName}
/> />
@ -1297,13 +1297,13 @@ export default function Estimate({}) {
//사양시공 //사양시공
let constructSpecificationMulti = estimateContextState?.constructSpecificationMulti?.split('、') let constructSpecificationMulti = estimateContextState?.constructSpecificationMulti?.split('、')
return ( return (
<div className={`form-flex-wrap ${style}`} key={`roof_${row}`}> <div className={`form-flex-wrap ${style}`} key={`roof_${index}_${row}`}>
<div className="input-wrap mr5" style={{ width: '610px' }}> <div className="input-wrap mr5" style={{ width: '610px' }}>
<input type="text" className="input-light" value={roofList} readOnly /> <input type="text" className="input-light" value={roofList || ''} readOnly />
</div> </div>
{constructSpecificationMulti ? ( {constructSpecificationMulti ? (
<div className="input-wrap" style={{ width: '200px' }}> <div className="input-wrap" style={{ width: '200px' }}>
<input type="text" className="input-light" value={constructSpecificationMulti[index]} readOnly /> <input type="text" className="input-light" value={constructSpecificationMulti[index] || ''} readOnly />
</div> </div>
) : null} ) : null}
</div> </div>
@ -1316,7 +1316,6 @@ export default function Estimate({}) {
<th>{getMessage('estimate.detail.remarks')}</th> <th>{getMessage('estimate.detail.remarks')}</th>
<td colSpan={3}> <td colSpan={3}>
<div className="input-wrap"> <div className="input-wrap">
{/* <input type="text" className="input-light" defaultValue={estimateContextState?.remarks || ''} onBlur={handleBlurRemarks} /> */}
<input <input
type="text" type="text"
className="input-light" className="input-light"

6
src/components/floor-plan/CanvasLayout.jsx
View File

@ -42,7 +42,9 @@ export default function CanvasLayout({ children }) {
{index !== 0 && ( {index !== 0 && (
<i <i
className="close" className="close"
onClick={(e) => onClick={(e) => {
//삭제 아이콘 눌렀는데 handleCurrentPlan실행되서 추가
e.stopPropagation()
swalFire({ swalFire({
text: `Plan ${plan.planNo} ` + getMessage('plan.message.confirm.delete'), text: `Plan ${plan.planNo} ` + getMessage('plan.message.confirm.delete'),
type: 'confirm', type: 'confirm',
@ -50,7 +52,7 @@ export default function CanvasLayout({ children }) {
handleDeletePlan(e, plan) handleDeletePlan(e, plan)
}, },
}) })
} }}
></i> ></i>
)} )}
</button> </button>

248
src/components/floor-plan/CanvasMenu.jsx
View File

@ -112,7 +112,7 @@ export default function CanvasMenu(props) {
const params = { const params = {
objectNo: objectNo, objectNo: objectNo,
planNo: pid, planNo: selectedPlan.planNo,
schDownload: donwloadType, schDownload: donwloadType,
schDrawingFlg: drawingFlg, schDrawingFlg: drawingFlg,
pwrGnrSimType: pwrGnrSimTypeRecoil.type, pwrGnrSimType: pwrGnrSimTypeRecoil.type,
@ -156,6 +156,7 @@ export default function CanvasMenu(props) {
text: getMessage('stuff.detail.move.confirmMsg'), text: getMessage('stuff.detail.move.confirmMsg'),
type: 'confirm', type: 'confirm',
confirmFn: () => { confirmFn: () => {
setIsGlobalLoading(true)
router.push(`/management/stuff/detail?objectNo=${objectNo}`, { scroll: false }) router.push(`/management/stuff/detail?objectNo=${objectNo}`, { scroll: false })
}, },
}) })
@ -172,38 +173,51 @@ export default function CanvasMenu(props) {
setType('surface') setType('surface')
break break
case 4: case 4:
if (!checkMenuAndCanvasState()) { console.log('🚀 ~ onClickNav ~ menu:', menu)
swalFire({ text: getMessage('menu.validation.canvas.roof') }) console.log('🚀 ~ onClickNav ~ menuNumber:', menuNumber)
return if (menuNumber < menu.index) {
if (!checkMenuAndCanvasState()) {
swalFire({ text: getMessage('menu.validation.canvas.roof') })
return
} else {
setType('module')
}
} else { } else {
setType('module') router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)
} }
break break
case 5: case 5:
// let pid = urlParams.get('pid') setIsGlobalLoading(true)
//로딩바해제는 견적서 상세조회쪽(useEstimateController.js)에서 setIsGlobalLoading(false)
promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => { promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => {
if (res.status === 200) { if (res.status === 200) {
const estimateDetail = res.data const estimateDetail = res.data
if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) { // if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) {
if (estimateDetail.estimateDate !== null) {
setMenuNumber(menu.index) setMenuNumber(menu.index)
setCurrentMenu(menu.title) setCurrentMenu(menu.title)
setFloorPlanObjectNo({ floorPlanObjectNo: objectNo }) setFloorPlanObjectNo({ floorPlanObjectNo: objectNo })
router.push(`/floor-plan/estimate/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) router.push(`/floor-plan/estimate/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`)
} else { } else {
setIsGlobalLoading(false)
swalFire({ text: getMessage('estimate.menu.move.valid1') }) swalFire({ text: getMessage('estimate.menu.move.valid1') })
} }
} }
}) })
break break
case 6: case 6:
setIsGlobalLoading(true)
//로딩바해제는 발전시뮬레이션 조회쪽에서(Simulator.jsx) setIsGlobalLoading(false)
promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => { promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan.planNo}/detail` }).then((res) => {
if (res.status === 200) { if (res.status === 200) {
const estimateDetail = res.data const estimateDetail = res.data
if (estimateDetail.tempFlg === '0') { if (estimateDetail.estimateDate !== null) {
setMenuNumber(menu.index) setMenuNumber(menu.index)
setCurrentMenu(menu.title) setCurrentMenu(menu.title)
router.push(`/floor-plan/simulator/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) router.push(`/floor-plan/simulator/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`)
} else { } else {
setIsGlobalLoading(false)
swalFire({ text: getMessage('simulator.menu.move.valid1') }) swalFire({ text: getMessage('simulator.menu.move.valid1') })
} }
} }
@ -215,9 +229,10 @@ export default function CanvasMenu(props) {
setMenuNumber(menu.index) setMenuNumber(menu.index)
setCurrentMenu(menu.title) setCurrentMenu(menu.title)
} }
if (pathname !== '/floor-plan') { if (pathname !== '/floor-plan') {
if (menu.index !== 0) { // if (menu.index !== 0 ) {
//견적서 or 발전시뮬레이션 탭에서 같은 탭 클릭시 화면 이동했다 돌아오지않도록..
if (menu.index !== 0 && menu.index !== 5 && menu.index !== 6) {
router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`) router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)
} }
} }
@ -257,7 +272,7 @@ export default function CanvasMenu(props) {
// 저장버튼(btn08) 클릭 시 호출되는 함수 // 저장버튼(btn08) 클릭 시 호출되는 함수
const handleSaveCanvas = async () => { const handleSaveCanvas = async () => {
await saveCanvas() await saveCanvas(true)
} }
// 나가기 버튼 클릭 // 나가기 버튼 클릭
@ -312,15 +327,15 @@ export default function CanvasMenu(props) {
confirmFn: async () => { confirmFn: async () => {
setIsGlobalLoading(true) setIsGlobalLoading(true)
const params = { const params = {
objectNo: objectNo, objectNo: estimateRecoilState.objectNo,
planNo: pid, planNo: estimateRecoilState.planNo,
userId: sessionState.userId, userId: sessionState.userId,
} }
try { try {
await promisePost({ url: '/api/estimate/reset-estimate', data: params }).then((res) => { await promisePost({ url: '/api/estimate/reset-estimate', data: params }).then((res) => {
if (res.status === 201) { if (res.status === 201) {
swalFire({ text: getMessage('estimate.detail.reset.alertMsg'), type: 'alert' }) swalFire({ text: getMessage('estimate.detail.reset.alertMsg'), type: 'alert' })
fetchSetting(objectNo, pid, 'R') fetchSetting(estimateRecoilState.objectNo, estimateRecoilState.planNo, 'R')
} }
}) })
} catch (error) { } catch (error) {
@ -359,9 +374,14 @@ export default function CanvasMenu(props) {
}, [basicSetting])*/ }, [basicSetting])*/
const checkMenuState = (menu) => { const checkMenuState = (menu) => {
return (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) || (menuNumber === 4 && menu.index === 2) return (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) || (menuNumber === 4 && [1, 2].includes(menu.index))
} }
/**
* 모듈, 회로 구성 이전 메뉴에서 메뉴 클릭으로 넘어올때
* 지붕면 할당이 끝난 지붕이 하나라도 있는지 체크
* @returns {boolean}
*/
const checkMenuAndCanvasState = () => { const checkMenuAndCanvasState = () => {
const roofs = canvas?.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) const roofs = canvas?.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
// 지붕면 할당이 끝난 지붕이 하나라도 있는지 체크 // 지붕면 할당이 끝난 지붕이 하나라도 있는지 체크
@ -372,40 +392,109 @@ export default function CanvasMenu(props) {
useEffect(() => { useEffect(() => {
if (isObjectNotEmpty(estimateRecoilState)) { if (isObjectNotEmpty(estimateRecoilState)) {
if (estimateRecoilState?.createUser === 'T01') { const { createUser, tempFlg, lockFlg } = estimateRecoilState
if (sessionState.userId !== 'T01') {
setButtonStyle1('none') if (createUser && tempFlg && lockFlg) {
setButtonStyle2('none') if (createUser === 'T01') {
setButtonStyle3('none') if (sessionState.storeId !== 'T01') {
setButtonStyle4('none') setAllButtonStyles('none')
setButtonStyle5('none')
}
} else {
if (estimateRecoilState?.tempFlg === '1') {
setButtonStyle1('none')
setButtonStyle2('')
setButtonStyle3('none')
setButtonStyle4('none')
setButtonStyle5('none')
} else {
if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
setButtonStyle1('')
setButtonStyle2('')
setButtonStyle3('')
setButtonStyle4('')
setButtonStyle5('')
} else { } else {
setButtonStyle1('') handleButtonStyles(tempFlg, lockFlg)
setButtonStyle2('none')
setButtonStyle3('none')
setButtonStyle4('')
setButtonStyle5('')
} }
} else {
handleButtonStyles(tempFlg, lockFlg)
} }
} }
} }
}, [estimateRecoilState]) }, [estimateRecoilState])
const setAllButtonStyles = (style) => {
setButtonStyle1(style)
setButtonStyle2(style)
setButtonStyle3(style)
setButtonStyle4(style)
setButtonStyle5(style)
}
const handleButtonStyles = (tempFlg, lockFlg) => {
if (tempFlg === '1') {
setAllButtonStyles('none')
setButtonStyle2('')
} else if (tempFlg === '0' && lockFlg === '0') {
setAllButtonStyles('')
} else {
setButtonStyle1('')
setButtonStyle2('none')
setButtonStyle3('none')
setButtonStyle4('')
setButtonStyle5('')
}
}
// useEffect(() => {
// if (isObjectNotEmpty(estimateRecoilState)) {
// if (estimateRecoilState?.createUser && estimateRecoilState?.tempFlg && estimateRecoilState.lockFlg) {
// if (estimateRecoilState?.createUser === 'T01') {
// if (sessionState.storeId !== 'T01') {
// setButtonStyle1('none')
// setButtonStyle2('none')
// setButtonStyle3('none')
// setButtonStyle4('none')
// setButtonStyle5('none')
// } else {
// if (estimateRecoilState?.tempFlg === '1') {
// setButtonStyle1('none')
// setButtonStyle2('')
// setButtonStyle3('none')
// setButtonStyle4('none')
// setButtonStyle5('none')
// } else {
// if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
// setButtonStyle1('')
// setButtonStyle2('')
// setButtonStyle3('')
// setButtonStyle4('')
// setButtonStyle5('')
// } else {
// setButtonStyle1('')
// setButtonStyle2('none')
// setButtonStyle3('none')
// setButtonStyle4('')
// setButtonStyle5('')
// }
// }
// }
// } else {
// if (isObjectNotEmpty(estimateRecoilState)) {
// if (estimateRecoilState?.tempFlg && estimateRecoilState.lockFlg) {
// if (estimateRecoilState?.tempFlg === '1') {
// setButtonStyle1('none')
// setButtonStyle2('')
// setButtonStyle3('none')
// setButtonStyle4('none')
// setButtonStyle5('none')
// } else {
// if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
// setButtonStyle1('')
// setButtonStyle2('')
// setButtonStyle3('')
// setButtonStyle4('')
// setButtonStyle5('')
// } else {
// setButtonStyle1('')
// setButtonStyle2('none')
// setButtonStyle3('none')
// setButtonStyle4('')
// setButtonStyle5('')
// }
// }
// }
// }
// }
// }
// }
// }, [estimateRecoilState])
/** /**
* 견적서 잠금 / 해제 * 견적서 잠금 / 해제
* lockFlg : 0 잠금해제상태 / 1 잠금상태 * lockFlg : 0 잠금해제상태 / 1 잠금상태
@ -415,7 +504,6 @@ export default function CanvasMenu(props) {
*/ */
const handleEstimateLockController = (estimateRecoilState) => { const handleEstimateLockController = (estimateRecoilState) => {
swalFire({ swalFire({
// text: estimateRecoilState.lockFlg === '0' ? getMessage('estimate.detail.lock.alertMsg') : getMessage('estimate.detail.unlock.alertMsg'),
html: estimateRecoilState.lockFlg === '0' ? getMessage('estimate.detail.lock.alertMsg') : getMessage('estimate.detail.unlock.alertMsg'), html: estimateRecoilState.lockFlg === '0' ? getMessage('estimate.detail.lock.alertMsg') : getMessage('estimate.detail.unlock.alertMsg'),
confirmButtonText: estimateRecoilState.lockFlg === '1' ? getMessage('estimate.detail.unlock.confirmBtnName') : '', confirmButtonText: estimateRecoilState.lockFlg === '1' ? getMessage('estimate.detail.unlock.confirmBtnName') : '',
type: 'confirm', type: 'confirm',
@ -431,37 +519,49 @@ export default function CanvasMenu(props) {
await promisePost({ url: '/api/estimate/save-estimate-lock', data: params }).then((res) => { await promisePost({ url: '/api/estimate/save-estimate-lock', data: params }).then((res) => {
if (res.status === 201) { if (res.status === 201) {
estimateRecoilState.lockFlg = estimateRecoilState.lockFlg === '0' ? '1' : '0' estimateRecoilState.lockFlg = estimateRecoilState.lockFlg === '0' ? '1' : '0'
if (estimateRecoilState?.createUser === 'T01') { const { createUser, tempFlg, lockFlg } = estimateRecoilState
if (sessionState.userId !== 'T01') { if (createUser && tempFlg && lockFlg) {
setButtonStyle1('none') if (createUser === 'T01') {
setButtonStyle2('none') if (sessionState.storeId !== 'T01') {
setButtonStyle3('none') setAllButtonStyles('none')
setButtonStyle4('none')
setButtonStyle5('none')
}
} else {
if (estimateRecoilState?.tempFlg === '1') {
setButtonStyle1('none')
setButtonStyle2('')
setButtonStyle3('none')
setButtonStyle4('none')
setButtonStyle5('none')
} else {
if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
setButtonStyle1('')
setButtonStyle2('')
setButtonStyle3('')
setButtonStyle4('')
setButtonStyle5('')
} else { } else {
setButtonStyle1('') handleButtonStyles(tempFlg, lockFlg)
setButtonStyle2('none')
setButtonStyle3('none')
setButtonStyle4('')
setButtonStyle5('')
} }
} else {
handleButtonStyles(tempFlg, lockFlg)
} }
} }
// if (estimateRecoilState?.createUser === 'T01') {
// if (sessionState.storeId !== 'T01') {
// setButtonStyle1('none')
// setButtonStyle2('none')
// setButtonStyle3('none')
// setButtonStyle4('none')
// setButtonStyle5('none')
// }
// } else {
// if (estimateRecoilState?.tempFlg === '1') {
// setButtonStyle1('none')
// setButtonStyle2('')
// setButtonStyle3('none')
// setButtonStyle4('none')
// setButtonStyle5('none')
// } else {
// if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') {
// setButtonStyle1('')
// setButtonStyle2('')
// setButtonStyle3('')
// setButtonStyle4('')
// setButtonStyle5('')
// } else {
// setButtonStyle1('')
// setButtonStyle2('none')
// setButtonStyle3('none')
// setButtonStyle4('')
// setButtonStyle5('')
// }
// }
// }
} }
setIsGlobalLoading(false) setIsGlobalLoading(false)
}) })
@ -493,7 +593,7 @@ export default function CanvasMenu(props) {
className={`canvas-menu-item ${menuNumber === menu.index ? 'active' : ''}`} className={`canvas-menu-item ${menuNumber === menu.index ? 'active' : ''}`}
onClick={() => { onClick={() => {
if (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) return if (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) return
if (menuNumber === 4 && menu.index === 2) return if (menuNumber === 4 && [1, 2].includes(menu.index)) return
onClickNav(menu) onClickNav(menu)
}} }}
> >
@ -572,20 +672,17 @@ export default function CanvasMenu(props) {
{menuNumber === 5 && ( {menuNumber === 5 && (
<> <>
<div className="ico-btn-from"> <div className="ico-btn-from">
{/* <button className="btn-frame gray ico-flx" onClick={() => setEstimatePopupOpen(true)}> */}
<button type="button" style={{ display: buttonStyle1 }} className="btn-frame gray ico-flx" onClick={() => setEstimatePopupOpen(true)}> <button type="button" style={{ display: buttonStyle1 }} className="btn-frame gray ico-flx" onClick={() => setEstimatePopupOpen(true)}>
<span className="ico ico01"></span> <span className="ico ico01"></span>
<span className="name">{getMessage('plan.menu.estimate.docDown')}</span> <span className="name">{getMessage('plan.menu.estimate.docDown')}</span>
</button> </button>
<button type="button" style={{ display: buttonStyle2 }} className="btn-frame gray ico-flx" onClick={handleEstimateSubmit}> <button type="button" style={{ display: buttonStyle2 }} className="btn-frame gray ico-flx" onClick={handleEstimateSubmit}>
{/* <button type="button" style={{ display: buttonStyle }} className="btn-frame gray ico-flx" onClick={handleEstimateSubmit}> */}
<span className="ico ico02"></span> <span className="ico ico02"></span>
<span className="name">{getMessage('plan.menu.estimate.save')}</span> <span className="name">{getMessage('plan.menu.estimate.save')}</span>
</button> </button>
<button <button
type="button" type="button"
style={{ display: buttonStyle3 }} style={{ display: buttonStyle3 }}
// style={{ display: buttonStyle }}
className="btn-frame gray ico-flx" className="btn-frame gray ico-flx"
onClick={() => { onClick={() => {
handleEstimateReset() handleEstimateReset()
@ -599,7 +696,6 @@ export default function CanvasMenu(props) {
<button <button
type="button" type="button"
style={{ display: buttonStyle4 }} style={{ display: buttonStyle4 }}
// style={{ display: buttonStyle }}
className="btn-frame gray ico-flx" className="btn-frame gray ico-flx"
onClick={() => { onClick={() => {
setEstimateCopyPopupOpen(true) setEstimateCopyPopupOpen(true)
@ -612,10 +708,8 @@ export default function CanvasMenu(props) {
<button <button
type="button" type="button"
style={{ display: buttonStyle5 }} style={{ display: buttonStyle5 }}
// style={{ display: buttonStyle }}
className="btn-frame gray ico-flx" className="btn-frame gray ico-flx"
onClick={() => { onClick={() => {
//시연준비
handleEstimateLockController(estimateRecoilState) handleEstimateLockController(estimateRecoilState)
}} }}
> >

2
src/components/floor-plan/MenuDepth01.jsx
View File

@ -26,7 +26,7 @@ export default function MenuDepth01() {
useEffect(() => { useEffect(() => {
handleMenu(type) handleMenu(type)
canvas.discardActiveObject() canvas?.discardActiveObject()
}, [currentMenu]) }, [currentMenu])
return ( return (
<div className="canvas-depth2-inner"> <div className="canvas-depth2-inner">

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

@ -30,7 +30,7 @@ const ALLOCATION_TYPE = {
export default function CircuitTrestleSetting({ id }) { export default function CircuitTrestleSetting({ id }) {
const { getMessage } = useMessage() const { getMessage } = useMessage()
const { closePopup } = usePopup() const { closePopup } = usePopup()
const { apply } = useTrestle() const { apply, setViewCircuitNumberTexts } = useTrestle()
const { swalFire } = useSwal() const { swalFire } = useSwal()
const { saveEstimate } = useEstimate() const { saveEstimate } = useEstimate()
const canvas = useRecoilValue(canvasState) const canvas = useRecoilValue(canvasState)
@ -94,14 +94,14 @@ export default function CircuitTrestleSetting({ id }) {
// 시리즈중 자동으로 추천 PCS 정보 조회 // 시리즈중 자동으로 추천 PCS 정보 조회
getPcsAutoRecommendList(params).then((res) => { getPcsAutoRecommendList(params).then((res) => {
if (res.data?.pcsItemList) { if (res.data?.pcsItemList) {
const itemList = models.filter((model) => { let pcsItemList = []
return res.data?.pcsItemList.map((item) => item.itemId).includes(model.itemId) res.data?.pcsItemList.forEach((item) => {
}) if (models.map((model) => model.itemId).includes(item.itemId)) {
const selectedModels = itemList.map((model) => { pcsItemList.push({
return { ...item,
...model, id: uuidv4(),
id: uuidv4(), isUsed: false,
isUsed: false, })
} }
}) })
// 회로 구성 가능 여부 체크 요청 파라미터 // 회로 구성 가능 여부 체크 요청 파라미터
@ -112,7 +112,7 @@ export default function CircuitTrestleSetting({ id }) {
pcsItemList: getPcsItemList(), pcsItemList: getPcsItemList(),
} }
// 추천 목록 선택 // 추천 목록 선택
setSelectedModels(selectedModels) setSelectedModels(pcsItemList)
// 회로 구성 가능 여부 체크 // 회로 구성 가능 여부 체크
getPcsVoltageChk(pcsVoltageChkParams).then((res) => { getPcsVoltageChk(pcsVoltageChkParams).then((res) => {
if (res.resultCode === 'S') { if (res.resultCode === 'S') {
@ -205,24 +205,26 @@ export default function CircuitTrestleSetting({ id }) {
const getRoofSurfaceList = () => { const getRoofSurfaceList = () => {
const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
roofSurfaceList.sort((a, b) => a.left - b.left || b.top - a.top) roofSurfaceList.sort((a, b) => a.left - b.left || b.top - a.top)
return roofSurfaceList.map((obj) => { return roofSurfaceList
return { .map((obj) => {
roofSurfaceId: obj.id, return {
roofSurface: canvas roofSurfaceId: obj.id,
.getObjects() roofSurface: canvas
.filter((o) => o.id === obj.parentId)[0] .getObjects()
.directionText.replace(/[0-9]/g, ''), .filter((o) => o.id === obj.parentId)[0]
roofSurfaceIncl: canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch, .directionText.replace(/[0-9]/g, ''),
moduleList: getModuleList(obj).map((module) => { roofSurfaceIncl: canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch,
return { moduleList: getModuleList(obj).map((module) => {
itemId: module.moduleInfo.itemId, return {
circuit: module.circuitNumber ? module.circuitNumber : null, itemId: module.moduleInfo.itemId,
pcsItemId: module.circuit ? module.circuit?.pcsItemId : null, circuit: module.circuitNumber ? module.circuitNumber : null,
uniqueId: module.id ? module.id : null, pcsItemId: module.circuit ? module.circuit?.pcsItemId : null,
} uniqueId: module.id ? module.id : null,
}), }
} }),
}) }
})
.filter((surface) => surface.moduleList.length > 0)
} }
// 모듈 목록 // 모듈 목록
@ -338,7 +340,18 @@ export default function CircuitTrestleSetting({ id }) {
const params = { const params = {
...getOptYn(), ...getOptYn(),
useModuleItemList: getUseModuleItemList(), useModuleItemList: getUseModuleItemList(),
roofSurfaceList: getRoofSurfaceList(), roofSurfaceList: getRoofSurfaceList().map((surface) => {
console.log(surface.moduleList)
return {
...surface,
moduleList: surface.moduleList.map((module) => {
return {
itemId: module.itemId,
uniqueId: module.uniqueId,
}
}),
}
}),
pcsItemList: getPcsItemList(), pcsItemList: getPcsItemList(),
} }
@ -348,19 +361,34 @@ export default function CircuitTrestleSetting({ id }) {
const itemList = models.filter((model) => { const itemList = models.filter((model) => {
return res.data?.pcsItemList.map((item) => item.itemId).includes(model.itemId) return res.data?.pcsItemList.map((item) => item.itemId).includes(model.itemId)
}) })
const selectedModels = itemList.map((model) => {
return { let pcsItemList = []
...model, let pcsObj = {}
id: uuidv4(), models.forEach((model) => {
pcsObj[model.itemId] = model
})
res.data?.pcsItemList.forEach((item) => {
if (pcsObj[item.itemId]) {
pcsItemList.push({
...pcsObj[item.itemId],
isUsed: false,
id: uuidv4(),
})
} }
}) })
const pcsVoltageChkParams = { const pcsVoltageChkParams = {
...getOptYn(), ...getOptYn(),
useModuleItemList: getUseModuleItemList(), useModuleItemList: getUseModuleItemList(),
roofSurfaceList: getRoofSurfaceList(), roofSurfaceList: getRoofSurfaceList(),
pcsItemList: getPcsItemList(), pcsItemList: pcsItemList.map((item) => {
return {
itemId: item.itemId,
pcsMkrCd: item.pcsMkrCd,
pcsSerCd: item.pcsSerCd,
}
}),
} }
setSelectedModels(selectedModels) setSelectedModels(pcsItemList)
getPcsVoltageChk(pcsVoltageChkParams).then((res) => { getPcsVoltageChk(pcsVoltageChkParams).then((res) => {
setAllocationType(ALLOCATION_TYPE.PASSIVITY) setAllocationType(ALLOCATION_TYPE.PASSIVITY)
}) })
@ -422,11 +450,18 @@ export default function CircuitTrestleSetting({ id }) {
obj.pcses = getStepUpListData() obj.pcses = getStepUpListData()
}) })
setViewCircuitNumberTexts(false)
//TODO : 이미지 저장
const result = await apply() const result = await apply()
if (result) { if (result) {
// TODO : 이미지 저장
setViewCircuitNumberTexts(true)
await saveEstimate(result) await saveEstimate(result)
} }
removeNotAllocationModules() // removeNotAllocationModules()
} }
const removeNotAllocationModules = () => { const removeNotAllocationModules = () => {
@ -536,37 +571,21 @@ export default function CircuitTrestleSetting({ id }) {
// 닫기 버튼 클릭 시 처리하는 함수 추가 // 닫기 버튼 클릭 시 처리하는 함수 추가
const handleClose = () => { const handleClose = () => {
swalFire({ // // 회로 번호 텍스트 제거
title: '변경사항을 저장하시겠습니까?', const circuitTexts = canvas.getObjects().filter((obj) => obj.name === 'circuitNumber')
//text: '저장하지 않은 변경사항은 모두 사라집니다.', canvas.remove(...circuitTexts)
type: 'confirm', // 모듈의 회로 정보 초기화
confirmButtonText: '저장', canvas
cancelButtonText: '취소', .getObjects()
icon: 'warning', .filter((obj) => obj.name === POLYGON_TYPE.MODULE)
confirmFn: async () => { .forEach((obj) => {
// 저장 로직 실행 obj.circuit = null
await onApply() obj.pcsItemId = null
closePopup(id) obj.circuitNumber = null
}, })
denyFn: () => {
// 회로 번호 텍스트 제거
const circuitTexts = canvas.getObjects().filter((obj) => obj.name === 'circuitNumber')
canvas.remove(...circuitTexts)
// 모듈의 회로 정보 초기화 canvas.renderAll()
canvas closePopup(id)
.getObjects()
.filter((obj) => obj.name === POLYGON_TYPE.MODULE)
.forEach((obj) => {
obj.circuit = null
obj.pcsItemId = null
obj.circuitNumber = null
})
canvas.renderAll()
closePopup(id)
},
})
} }
return ( return (
@ -592,7 +611,7 @@ export default function CircuitTrestleSetting({ id }) {
{tabNum === 2 && <StepUp {...stepUpProps} onInitialize={handleStepUpInitialize} />} {tabNum === 2 && <StepUp {...stepUpProps} onInitialize={handleStepUpInitialize} />}
{tabNum === 1 && allocationType === ALLOCATION_TYPE.AUTO && ( {tabNum === 1 && allocationType === ALLOCATION_TYPE.AUTO && (
<div className="grid-btn-wrap"> <div className="grid-btn-wrap">
<button className="btn-frame modal mr5" onClick={() => onAutoRecommend()}> <button className="btn-frame modal mr5 act" onClick={() => onAutoRecommend()}>
{getMessage('modal.circuit.trestle.setting.circuit.allocation.auto')} {getMessage('modal.circuit.trestle.setting.circuit.allocation.auto')}
</button> </button>
<button className="btn-frame modal act" onClick={() => onPassivityAllocation()}> <button className="btn-frame modal act" onClick={() => onPassivityAllocation()}>
@ -602,7 +621,7 @@ export default function CircuitTrestleSetting({ id }) {
)} )}
{tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY && ( {tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY && (
<div className="grid-btn-wrap"> <div className="grid-btn-wrap">
<button className="btn-frame modal mr5" onClick={() => onClickPrev()}> <button className="btn-frame modal mr5 " onClick={() => onClickPrev()}>
{getMessage('modal.common.prev')} {getMessage('modal.common.prev')}
</button> </button>
<button className="btn-frame modal act" onClick={() => setTabNum(2)}> <button className="btn-frame modal act" onClick={() => setTabNum(2)}>

7
src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
View File

@ -91,7 +91,6 @@ export default function PowerConditionalSelect(props) {
} }
const onCheckSeries = (data) => { const onCheckSeries = (data) => {
console.log('data', data)
const copySeries = series.map((s) => { const copySeries = series.map((s) => {
return { return {
...s, ...s,
@ -99,12 +98,10 @@ export default function PowerConditionalSelect(props) {
} }
}) })
setSeries(copySeries) setSeries(copySeries)
console.log('copySeries', copySeries)
handleSetmodels(copySeries.filter((s) => s.selected)) handleSetmodels(copySeries.filter((s) => s.selected))
} }
const handleSetmodels = (selectedSeries) => { const handleSetmodels = (selectedSeries) => {
console.log('series', selectedSeries)
if (selectedSeries.length === 0) { if (selectedSeries.length === 0) {
setModels([]) setModels([])
setSelectedModels([]) setSelectedModels([])
@ -149,7 +146,7 @@ export default function PowerConditionalSelect(props) {
return return
} }
setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4() }]) setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }])
setSelectedRow(null) setSelectedRow(null)
} }
@ -160,10 +157,10 @@ export default function PowerConditionalSelect(props) {
const onChangeMaker = (option) => { const onChangeMaker = (option) => {
if (option) { if (option) {
setModels([]) setModels([])
setSelectedModels([])
setSelectedMaker(option) setSelectedMaker(option)
getPcsMakerList(option).then((res) => { getPcsMakerList(option).then((res) => {
console.log('getPcsMakerList(series)', res.data)
setSeries( setSeries(
res.data.map((series) => { res.data.map((series) => {
return { ...series, selected: false } return { ...series, selected: false }

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

@ -12,6 +12,7 @@ import { useMasterController } from '@/hooks/common/useMasterController'
import { v4 as uuidv4 } from 'uuid' import { v4 as uuidv4 } from 'uuid'
import { globalLocaleStore } from '@/store/localeAtom' import { globalLocaleStore } from '@/store/localeAtom'
import { POLYGON_TYPE } from '@/common/common' import { POLYGON_TYPE } from '@/common/common'
import { circuitNumDisplaySelector } from '@/store/settingAtom'
export default function StepUp(props) { export default function StepUp(props) {
const { const {
@ -32,7 +33,7 @@ export default function StepUp(props) {
const [moduleTabs, setModuleTabs] = useState({}) const [moduleTabs, setModuleTabs] = useState({})
const [arrayLength, setArrayLength] = useState(3) //module-table-inner의 반복 개수 const [arrayLength, setArrayLength] = useState(3) //module-table-inner의 반복 개수
const [pcsCheck, setPcsCheck] = useRecoilState(pcsCheckState) const [pcsCheck, setPcsCheck] = useRecoilState(pcsCheckState)
const { getPcsVoltageStepUpList, getPcsAutoRecommendList, getPcsVoltageChk } = useMasterController() const { getPcsVoltageStepUpList, getPcsAutoRecommendList, getPcsVoltageChk, getPcsConnOptionItemList } = useMasterController()
const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext) const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
const canvas = useRecoilValue(canvasState) const canvas = useRecoilValue(canvasState)
const selectedModules = useRecoilValue(selectedModuleState) const selectedModules = useRecoilValue(selectedModuleState)
@ -43,7 +44,7 @@ export default function StepUp(props) {
// 선택된 값들을 저장할 상태 추가 // 선택된 값들을 저장할 상태 추가
const [selectedValues, setSelectedValues] = useState({}) const [selectedValues, setSelectedValues] = useState({})
const isDisplayCircuitNumber = useRecoilValue(circuitNumDisplaySelector)
// useCanvasPopupStatusController(6) // useCanvasPopupStatusController(6)
// const canvasPopupStatusState = useRecoilValue(canvasPopupStatusStore) // const canvasPopupStatusState = useRecoilValue(canvasPopupStatusStore)
// if (Object.keys(canvasPopupStatusState[6]).length !== 0) { // if (Object.keys(canvasPopupStatusState[6]).length !== 0) {
@ -51,20 +52,19 @@ export default function StepUp(props) {
// } // }
useEffect(() => { useEffect(() => {
// PCS 승압설정 정보 조회 console.log(allocationType)
if (allocationType === 'auto') { if (allocationType === 'auto') {
fetchStepUpData() // PCS 자동 승압설정 정보 조회
fetchAutoStepUpData()
} else { } else {
// 1-1 2-2 // PCS 수동 승압설정 정보 조회
canvas fetchPassiStepUpData()
.getObjects()
.filter((obj) => obj.name === POLYGON_TYPE.MODULE && obj.circuit)
.map((module) => module.circuitNumber)
} }
}, []) }, [])
// PCS 승압설정 정보 조회 // PCS 자동 승압설정 정보 조회
const fetchStepUpData = async () => { const fetchAutoStepUpData = async () => {
try { try {
const params = { const params = {
...props.getOptYn(), // 옵션 Y/N ...props.getOptYn(), // 옵션 Y/N
@ -106,6 +106,89 @@ export default function StepUp(props) {
} }
} }
// PCS 수동 승압설정 정보 조회
const fetchPassiStepUpData = async () => {
try {
// 1-1 2-2
// canvas
// .getObjects()
// .filter((obj) => obj.name === POLYGON_TYPE.MODULE && obj.circuit)
// .map((module) => module.circuitNumber)
// 모듈 데이터 가져오기
const modules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE)
// PCS별 회로 정보를 저장할 객체
const pcsSummary = {}
// 각 모듈을 순회하며 PCS별 회로 정보 수집
modules.forEach((module) => {
if (!module.circuit || !module.pcsItemId) return
if (!pcsSummary[module.pcsItemId]) {
pcsSummary[module.pcsItemId] = {
circuits: {},
totalModules: 0,
}
}
const circuitNumber = module.circuitNumber
if (!pcsSummary[module.pcsItemId].circuits[circuitNumber]) {
pcsSummary[module.pcsItemId].circuits[circuitNumber] = 0
}
pcsSummary[module.pcsItemId].circuits[circuitNumber]++
pcsSummary[module.pcsItemId].totalModules++
})
const params = {
useModuleItemList: props.getUseModuleItemList(),
pcsItemList: getSelectedPcsItemList(),
}
// PCS 접속함 및 옵션 목록 조회
getPcsConnOptionItemList(params).then((res) => {
if (res?.result.code === 200 && res?.data) {
// PCS 아이템 리스트에 serQtyList 추가
const pcsItemListWithSerQty = res.data.pcsItemList.map((pcsItem) => {
const pcsData = pcsSummary[pcsItem.itemId] || { circuits: {}, totalModules: 0 }
const circuitCounts = Object.values(pcsData.circuits)
return {
...pcsItem,
serQtyList: [
{
// 한 회로당 최대 모듈 수
serQty: circuitCounts.length > 0 ? Math.max(...circuitCounts) : 0,
// 회로 개수
paralQty: Object.keys(pcsData.circuits).length || 0,
rmdYn: 'Y',
usePossYn: 'Y',
roofSurfaceList: props.getRoofSurfaceList(),
},
],
}
})
// Update res.data with modified pcsItemList
res.data.pcsItemList = pcsItemListWithSerQty
setSelectedModels(pcsItemListWithSerQty)
const dataArray = Array.isArray(res.data) ? res.data : [res.data]
const stepUpListData = formatStepUpListData(dataArray)
// PCS 승압설정 정보 SET
setStepUpListData(stepUpListData)
// PCS 옵션 조회
const formattedOptCodes = formatOptionCodes(res.data.optionList)
setOptCodes(formattedOptCodes)
setSeletedOption(formattedOptCodes[0])
}
})
} catch (error) {
console.error('Error fetching step up data:', error)
}
}
// PCS 옵션 조회 // PCS 옵션 조회
const formatOptionCodes = (optionList = []) => { const formatOptionCodes = (optionList = []) => {
return optionList?.map((opt) => ({ return optionList?.map((opt) => ({
@ -124,40 +207,6 @@ export default function StepUp(props) {
selectedPcsItem: formatPcsItemList(stepUps.pcsItemList), selectedPcsItem: formatPcsItemList(stepUps.pcsItemList),
})) }))
// 초기 추천 값들을 selectedValues에 저장
const initialSelectedValues = {}
formattedData.forEach((stepUp) => {
stepUp.pcsItemList.forEach((pcsItem, pcsIdx) => {
const pcsKey = `${pcsItem.goodsNo}_${pcsIdx}`
// 추천 값(rmdYn === 'Y') 찾기
const recommendedRow = pcsItem.serQtyList.find((item) => item.rmdYn === 'Y')
if (recommendedRow) {
const selectionData = {
stepUpId: pcsItem.goodsNo,
pcsInfo: {
itemId: pcsItem.itemId,
goodsNo: pcsItem.goodsNo,
pcsMkrCd: pcsItem.pcsMkrCd,
pcsSerCd: pcsItem.pcsSerCd,
},
allocation: {
serQty: recommendedRow.serQty,
paralQty: recommendedRow.paralQty,
},
}
initialSelectedValues[pcsItem.goodsNo] = {
...initialSelectedValues[pcsItem.goodsNo],
[pcsKey]: selectionData,
}
}
})
})
// 초기 추천 값들을 selectedValues에 저장
setSelectedValues(initialSelectedValues)
return formattedData return formattedData
} }
@ -239,8 +288,12 @@ export default function StepUp(props) {
// 행 선택 핸들러 함수 추가 // 행 선택 핸들러 함수 추가
const handleRowClick = (mainIdx, subIdx) => { const handleRowClick = (mainIdx, subIdx) => {
// 자동 승압 설정인 경우만 실행
if (allocationType !== 'auto') return
let tempStepUpListData = [...stepUpListData] let tempStepUpListData = [...stepUpListData]
let selectedData = {} let selectedData = {}
tempStepUpListData[0].pcsItemList[mainIdx].serQtyList.forEach((item, index) => { tempStepUpListData[0].pcsItemList[mainIdx].serQtyList.forEach((item, index) => {
if (index === subIdx) { if (index === subIdx) {
selectedData = item selectedData = item
@ -323,6 +376,7 @@ export default function StepUp(props) {
name: 'circuitNumber', name: 'circuitNumber',
parentId: targetModule.id, parentId: targetModule.id,
circuitInfo: module.pcsItemId, circuitInfo: module.pcsItemId,
visible: isDisplayCircuitNumber,
}) })
targetModule.circuit = moduleCircuitText targetModule.circuit = moduleCircuitText
targetModule.pcsItemId = module.pcsItemId targetModule.pcsItemId = module.pcsItemId
@ -399,7 +453,7 @@ export default function StepUp(props) {
key={`row-${serQtyIdx}`} key={`row-${serQtyIdx}`}
className={`${item.selected ? 'on' : ''}`} className={`${item.selected ? 'on' : ''}`}
onClick={() => handleRowClick(idx, serQtyIdx)} onClick={() => handleRowClick(idx, serQtyIdx)}
style={{ cursor: 'pointer' }} style={{ cursor: allocationType === 'auto' ? 'pointer' : 'default' }}
> >
<td className="al-r">{item.serQty}</td> <td className="al-r">{item.serQty}</td>
<td className="al-r">{item.paralQty}</td> <td className="al-r">{item.paralQty}</td>

142
src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
View File

@ -7,6 +7,7 @@ import { useSwal } from '@/hooks/useSwal'
import { canvasState } from '@/store/canvasAtom' import { canvasState } from '@/store/canvasAtom'
import { moduleStatisticsState } from '@/store/circuitTrestleAtom' import { moduleStatisticsState } from '@/store/circuitTrestleAtom'
import { selectedModuleState } from '@/store/selectedModuleOptions' import { selectedModuleState } from '@/store/selectedModuleOptions'
import { circuitNumDisplaySelector } from '@/store/settingAtom'
import { useContext, useEffect, useState } from 'react' import { useContext, useEffect, useState } from 'react'
import { useRecoilState, useRecoilValue } from 'recoil' import { useRecoilState, useRecoilValue } from 'recoil'
@ -29,6 +30,7 @@ export default function PassivityCircuitAllocation(props) {
const [targetModules, setTargetModules] = useState([]) const [targetModules, setTargetModules] = useState([])
const { setModuleStatisticsData } = useModule() const { setModuleStatisticsData } = useModule()
const { getPcsManualConfChk } = useMasterController() const { getPcsManualConfChk } = useMasterController()
const isDisplayCircuitNumber = useRecoilValue(circuitNumDisplaySelector)
useEffect(() => { useEffect(() => {
console.log('header, rows', header, rows) console.log('header, rows', header, rows)
@ -79,36 +81,36 @@ export default function PassivityCircuitAllocation(props) {
const setSurfaceInfo = () => { const setSurfaceInfo = () => {
const surfaces = canvas.getObjects().filter((obj) => POLYGON_TYPE.MODULE_SETUP_SURFACE === obj.name) const surfaces = canvas.getObjects().filter((obj) => POLYGON_TYPE.MODULE_SETUP_SURFACE === obj.name)
// setHeaders([header[0], { name: '회로', prop: 'circuit' }, ...header.slice(1)]) // setHeaders([header[0], { name: '회로', prop: 'circuit' }, ...header.slice(1)])
setRows( // setRows(
rows.map((row) => { // rows.map((row) => {
return { // return {
...row, // ...row,
circuit: '', // circuit: '',
} // }
}), // }),
) // )
let totals = {} // let totals = {}
rows.forEach((row) => { // rows.forEach((row) => {
if (header.length === 4) { // if (header.length === 4) {
if (!totals[header[2].prop]) totals[header[2].prop] = 0 // if (!totals[header[2].prop]) totals[header[2].prop] = 0
totals[header[2].prop] += +row[header[2].prop] // totals[header[2].prop] += +row[header[2].prop]
} else if (header.length === 5) { // } else if (header.length === 5) {
if (!totals[header[2].prop]) totals[header[2].prop] = 0 // if (!totals[header[2].prop]) totals[header[2].prop] = 0
totals[header[2].prop] += +row[header[2].prop] // totals[header[2].prop] += +row[header[2].prop]
if (!totals[header[3].prop]) totals[header[3].prop] = 0 // if (!totals[header[3].prop]) totals[header[3].prop] = 0
totals[header[3]] += +row[header[3]] // totals[header[3]] += +row[header[3]]
} // }
}) // })
setFooter([ // setFooter([
...['합계', ''], // ...['합계', ''],
...Object.keys(totals).map((key) => { // ...Object.keys(totals).map((key) => {
return totals[key] // return totals[key]
}), // }),
Object.keys(totals).reduce((acc, key) => { // Object.keys(totals).reduce((acc, key) => {
return acc + totals[key] // return acc + totals[key]
}, 0), // }, 0),
]) // ])
// let totalWpout = 0 // let totalWpout = 0
// const rows = surfaces.map((surface) => { // const rows = surfaces.map((surface) => {
// let wpOut = 0 // let wpOut = 0
@ -215,6 +217,7 @@ export default function PassivityCircuitAllocation(props) {
name: 'circuitNumber', name: 'circuitNumber',
parentId: obj.id, parentId: obj.id,
circuitInfo: selectedPcs, circuitInfo: selectedPcs,
visible: isDisplayCircuitNumber,
}) })
obj.set({ obj.set({
strokeWidth: 0.3, strokeWidth: 0.3,
@ -226,10 +229,23 @@ export default function PassivityCircuitAllocation(props) {
setSelectedPcs(tempSelectedPcs) setSelectedPcs(tempSelectedPcs)
canvas.add(moduleCircuitText) canvas.add(moduleCircuitText)
}) })
console.log('🚀 ~ handleCircuitNumberFix ~ selectedModels:', selectedModels)
// let pcsList = [...selectedModels.map((model) => ({ ...model }))]
let pcsList = JSON.parse(JSON.stringify(selectedModels))
pcsList = pcsList.map((model) => {
console.log('🚀 ~ handleCircuitNumberFix ~ pcsList:', pcsList)
if (model.id === selectedPcs.id) {
model.isUsed = true
}
return model
})
console.log('🚀 ~ handleCircuitNumberFix ~ pcsList:', pcsList)
const roofSurfaceList = canvas const roofSurfaceList = canvas
.getObjects() .getObjects()
.filter((obj) => POLYGON_TYPE.MODULE_SETUP_SURFACE === obj.name) .filter((obj) => POLYGON_TYPE.MODULE_SETUP_SURFACE === obj.name && obj?.modules.length > 0)
.map((surface) => { .map((surface) => {
return { return {
roofSurfaceId: surface.id, roofSurfaceId: surface.id,
@ -246,45 +262,25 @@ export default function PassivityCircuitAllocation(props) {
}) })
console.log('uniqueCircuitNumbers', uniqueCircuitNumbers) console.log('uniqueCircuitNumbers', uniqueCircuitNumbers)
const usedPcses = selectedModels.filter((model) => model.isUsed) const usedPcses = pcsList.filter((model) => model.isUsed)
const pcsItemList = const pcsItemList = usedPcses.map((model, index) => {
usedPcses.length === 0 return {
? [ pcsMkrCd: model.pcsMkrCd,
{ pcsSerCd: model.pcsSerCd,
pcsMkrCd: selectedPcs.pcsMkrCd, itemId: model.itemId,
pcsSerCd: selectedPcs.pcsSerCd, itemNm: model.itemNm,
itemId: selectedPcs.itemId, goodsNo: model.goodsNo,
itemNm: selectedPcs.itemNm, serQtyList: [
goodsNo: selectedPcs.goodsNo, {
serQtyList: [ serQty: targetModules.length,
{ paralQty: uniqueCircuitNumbers.length,
serQty: targetModules.length, rmdYn: 'Y',
paralQty: uniqueCircuitNumbers.length, usePossYn: 'Y',
rmdYn: 'Y', roofSurfaceList: roofSurfaceList,
usePossYn: 'Y', },
roofSurfaceList: roofSurfaceList, ],
}, }
], })
},
]
: selectedModels.map((model, index) => {
return {
pcsMkrCd: model.pcsMkrCd,
pcsSerCd: model.pcsSerCd,
itemId: model.itemId,
itemNm: model.itemNm,
goodsNo: model.goodsNo,
serQtyList: [
{
serQty: targetModules.length,
paralQty: uniqueCircuitNumbers.length,
rmdYn: 'Y',
usePossYn: 'Y',
roofSurfaceList: roofSurfaceList,
},
],
}
})
const params = { const params = {
...getApiProps(), ...getApiProps(),
@ -318,17 +314,15 @@ export default function PassivityCircuitAllocation(props) {
return return
} }
setSelectedModels( setSelectedModels(pcsList)
selectedModels.map((model) => {
return { ...model, isUsed: model.id === selectedPcs.id ? true : model.isUsed }
}),
)
setTargetModules([]) setTargetModules([])
setCircuitNumber(+circuitNumber + 1) setCircuitNumber(+circuitNumber + 1)
setModuleStatisticsData() setModuleStatisticsData()
}) })
} }
console.log('🚀 ~ handleCircuitNumberFix ~ selectedModels:', selectedModels)
console.log('🚀 ~ handleCircuitNumberFix ~ selectedModels:', selectedModels)
const getCircuitNumber = () => { const getCircuitNumber = () => {
if (selectedModels.length === 1) { if (selectedModels.length === 1) {

9
src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx
View File

@ -1,10 +1,12 @@
'use client' 'use client'
import { useState } from 'react' import { useEffect, useState } from 'react'
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
import WithDraggable from '@/components/common/draggable/WithDraggable' import WithDraggable from '@/components/common/draggable/WithDraggable'
import { moduleStatisticsState } from '@/store/circuitTrestleAtom' import { moduleStatisticsState } from '@/store/circuitTrestleAtom'
import { useRecoilValue, useResetRecoilState } from 'recoil' import { useRecoilValue, useResetRecoilState } from 'recoil'
import { useModule } from '@/hooks/module/useModule'
import { useEavesGableEdit } from '@/hooks/roofcover/useEavesGableEdit'
export default function PanelBatchStatistics() { export default function PanelBatchStatistics() {
const { getMessage } = useMessage() const { getMessage } = useMessage()
@ -14,6 +16,11 @@ export default function PanelBatchStatistics() {
y: 30, y: 30,
}) })
const { header, rows, footer } = useRecoilValue(moduleStatisticsState) const { header, rows, footer } = useRecoilValue(moduleStatisticsState)
const { setModuleStatisticsData } = useModule()
useEffect(() => {
setModuleStatisticsData()
}, [])
return ( return (
<WithDraggable isShow={true} handle=".penal-wrap" pos={pos}> <WithDraggable isShow={true} handle=".penal-wrap" pos={pos}>

113
src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx
View File

@ -116,22 +116,25 @@ export default function ContextRoofAllocationSetting(props) {
)} )}
</div> </div>
</div> </div>
<div className="block-box"> {roof.raftAuth && (
<div className="flex-ment"> <div className="block-box">
<span>{getMessage('slope')}</span> <div className="flex-ment">
<div className="input-grid"> <span>{getMessage('modal.placement.initial.setting.rafter')}</span>
<input {raftCodes.length > 0 && (
type="text" <div className="grid-select">
className="input-origin block" <QSelectBox
onChange={(e) => { options={raftCodes}
handleChangePitch(e, index) value={roof}
}} showKey={'clCodeNm'}
defaultValue={currentAngleType === 'slope' ? roof.pitch : roof.angle} sourceKey={'clCode'}
/> targetKey={roof.raft ? 'raft' : 'raftBaseCd'}
/>
</div>
)}
</div> </div>
<span className="absol">{pitchText}</span>
</div> </div>
</div> )}
{(roof.widAuth || roof.lenAuth) && ( {(roof.widAuth || roof.lenAuth) && (
<> <>
{roof.widAuth && ( {roof.widAuth && (
@ -139,7 +142,15 @@ export default function ContextRoofAllocationSetting(props) {
<div className="flex-ment"> <div className="flex-ment">
<span>W</span> <span>W</span>
<div className="input-grid"> <div className="input-grid">
<input type="text" className="input-origin block" defaultValue={roof.width} readOnly={roof.widAuth === 'R'} /> <input
type="text"
className="input-origin block"
defaultValue={roof.width}
readOnly={roof.widAuth === 'R'}
onChange={(e) => {
handleChangeInput(e, 'width', index)
}}
/>
</div> </div>
</div> </div>
</div> </div>
@ -148,44 +159,15 @@ export default function ContextRoofAllocationSetting(props) {
<div className="block-box"> <div className="block-box">
<div className="flex-ment"> <div className="flex-ment">
<span>L</span> <span>L</span>
<div className="input-grid">
<input type="text" className="input-origin block" defaultValue={roof.length} readOnly={roof.lenAuth === 'R'} />
</div>
</div>
</div>
)}
</>
)}
{(roof.raftAuth || roof.roofPchAuth) && (
<>
{roof.raftAuth && (
<div className="block-box">
<div className="flex-ment">
<span>{getMessage('modal.placement.initial.setting.rafter')}</span>
{raftCodes.length > 0 && (
<div className="grid-select">
<QSelectBox
options={raftCodes}
value={roof}
showKey={'clCodeNm'}
sourceKey={'clCode'}
targetKey={roof.raft ? 'raft' : 'raftBaseCd'}
/>
</div>
)}
</div>
</div>
)}
{roof.roofPchAuth && (
<div className="block-box">
<div className="flex-ment">
<span>{getMessage('hajebichi')}</span>
<div className="input-grid"> <div className="input-grid">
<input <input
type="text" type="text"
className="input-origin block" className="input-origin block"
value={parseInt(roof.hajebichi)} defaultValue={roof.length}
readOnly={roof.roofPchAuth === 'R'} readOnly={roof.lenAuth === 'R'}
onChange={(e) => {
handleChangeInput(e, 'length', index)
}}
/> />
</div> </div>
</div> </div>
@ -193,6 +175,39 @@ export default function ContextRoofAllocationSetting(props) {
)} )}
</> </>
)} )}
{roof.roofPchAuth && (
<div className="block-box">
<div className="flex-ment">
<span>{getMessage('hajebichi')}</span>
<div className="input-grid">
<input
type="text"
className="input-origin block"
value={parseInt(roof.hajebichi)}
readOnly={roof.roofPchAuth === 'R'}
onChange={(e) => handleChangeInput(e, 'hajebichi', index)}
/>
</div>
</div>
</div>
)}
<div className="block-box">
<div className="flex-ment">
<span>{getMessage('slope')}</span>
<div className="input-grid">
<input
type="text"
className="input-origin block"
onChange={(e) => {
handleChangeInput(e, currentAngleType === 'slope' ? 'pitch' : 'angle', index)
handleChangePitch(e, index)
}}
defaultValue={currentAngleType === 'slope' ? roof.pitch : roof.angle}
/>
</div>
<span className="absol">{pitchText}</span>
</div>
</div>
<div className="block-box"> <div className="block-box">
<div className="icon-btn-wrap"> <div className="icon-btn-wrap">
<button <button

101
src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx
View File

@ -33,7 +33,6 @@ export default function RoofAllocationSetting(props) {
handleChangeLayout, handleChangeLayout,
currentRoofList, currentRoofList,
handleChangeInput, handleChangeInput,
handleChangePitch,
} = useRoofAllocationSetting(id) } = useRoofAllocationSetting(id)
const pitchText = useRecoilValue(pitchTextSelector) const pitchText = useRecoilValue(pitchTextSelector)
const { findCommonCode } = useCommonCode() const { findCommonCode } = useCommonCode()
@ -118,22 +117,27 @@ export default function RoofAllocationSetting(props) {
)} )}
</div> </div>
</div> </div>
<div className="block-box">
<div className="flex-ment"> {roof.raftAuth && (
<span>{getMessage('slope')}</span> <div className="block-box">
<div className="input-grid"> <div className="flex-ment">
<input <span>{getMessage('modal.placement.initial.setting.rafter')}</span>
type="text" {raftCodes.length > 0 && (
className="input-origin block" <div className="grid-select">
onChange={(e) => { <QSelectBox
handleChangePitch(e, index) options={raftCodes}
}} value={roof}
defaultValue={currentAngleType === 'slope' ? roof.pitch : roof.angle} showKey={'clCodeNm'}
/> sourceKey={'clCode'}
targetKey={roof.raft ? 'raft' : 'raftBaseCd'}
onChange={(e) => handleChangeRaft(e, index)}
/>
</div>
)}
</div> </div>
<span className="absol">{pitchText}</span>
</div> </div>
</div> )}
{(roof.widAuth || roof.lenAuth) && ( {(roof.widAuth || roof.lenAuth) && (
<> <>
{roof.widAuth && ( {roof.widAuth && (
@ -170,45 +174,38 @@ export default function RoofAllocationSetting(props) {
)} )}
</> </>
)} )}
{(roof.raftAuth || roof.roofPchAuth) && ( {roof.roofPchAuth && (
<> <div className="block-box">
{roof.raftAuth && ( <div className="flex-ment">
<div className="block-box"> <span>{getMessage('hajebichi')}</span>
<div className="flex-ment"> <div className="input-grid">
<span>{getMessage('modal.placement.initial.setting.rafter')}</span> <input
{raftCodes.length > 0 && ( type="text"
<div className="grid-select"> className="input-origin block"
<QSelectBox onChange={(e) => handleChangeInput(e, 'hajebichi', index)}
options={raftCodes} value={parseInt(roof.hajebichi)}
value={roof} readOnly={roof.roofPchAuth === 'R'}
showKey={'clCodeNm'} />
sourceKey={'clCode'}
targetKey={roof.raft ? 'raft' : 'raftBaseCd'}
onChange={(e) => handleChangeRaft(e, index)}
/>
</div>
)}
</div>
</div> </div>
)} </div>
{roof.roofPchAuth && ( </div>
<div className="block-box">
<div className="flex-ment">
<span>{getMessage('hajebichi')}</span>
<div className="input-grid">
<input
type="text"
className="input-origin block"
onChange={(e) => handleChangeInput(e, 'hajebichi', index)}
value={parseInt(roof.hajebichi)}
readOnly={roof.roofPchAuth === 'R'}
/>
</div>
</div>
</div>
)}
</>
)} )}
<div className="block-box">
<div className="flex-ment">
<span>{getMessage('slope')}</span>
<div className="input-grid">
<input
type="text"
className="input-origin block"
onChange={(e) => {
handleChangePitch(e, index)
}}
defaultValue={currentAngleType === 'slope' ? roof.pitch : roof.angle}
/>
</div>
<span className="absol">{pitchText}</span>
</div>
</div>
<div className="block-box"> <div className="block-box">
<div className="icon-btn-wrap"> <div className="icon-btn-wrap">
<button <button

2
src/components/simulator/Simulator.jsx
View File

@ -176,7 +176,6 @@ export default function Simulator() {
const [content, setContent] = useState('') const [content, setContent] = useState('')
const fetchSimulatorNotice = async () => { const fetchSimulatorNotice = async () => {
setIsGlobalLoading(true)
get({ url: '/api/pwrGnrSimulation/guideInfo' }).then((res) => { get({ url: '/api/pwrGnrSimulation/guideInfo' }).then((res) => {
if (res.data) { if (res.data) {
setContent(res.data.replaceAll('\n', '<br/>')) setContent(res.data.replaceAll('\n', '<br/>'))
@ -184,7 +183,6 @@ export default function Simulator() {
setContent(getMessage('common.message.no.data')) setContent(getMessage('common.message.no.data'))
} }
}) })
setIsGlobalLoading(false)
} }
// 차트 데이터 변경 시, list type 셋팅 // 차트 데이터 변경 시, list type 셋팅

13
src/hooks/common/useMasterController.js
View File

@ -241,6 +241,18 @@ export function useMasterController() {
return await put({ url: '/api/object/update-object-date', data: params }) return await put({ url: '/api/object/update-object-date', data: params })
} }
/**
* PCS 접속함 및 옵션 목록 조회
* @param {사용된 모듈 아이템 목록} useModuleItemList
* @param {PCS 제품 목록} pcsItemList
* @returns
*/
const getPcsConnOptionItemList = async (params = null) => {
return await post({ url: '/api/v1/master/getPcsConnOptionItemList', data: params }).then((res) => {
return res
})
}
return { return {
getRoofMaterialList, getRoofMaterialList,
getModuleTypeItemList, getModuleTypeItemList,
@ -255,5 +267,6 @@ export function useMasterController() {
getPcsVoltageStepUpList, getPcsVoltageStepUpList,
updateObjectDate, updateObjectDate,
getQuotationItem, getQuotationItem,
getPcsConnOptionItemList,
} }
} }

57
src/hooks/common/useRefFiles.js
View File

@ -66,15 +66,20 @@ export function useRefFiles() {
} }
const refFileSetting = (file) => { const refFileSetting = (file) => {
if (file && ['image/png', 'image/jpg', 'image/jpeg', 'image/bmp', 'image/gif'].includes(file.type)) { console.log('🚀 ~ refFileSetting ~ file:', file)
// setRefImage(file) if (file.name.split('.').pop() === 'dwg') {
file.name.split('.').pop() === 'dwg' ? handleUploadConvertRefFile(file) : handleUploadImageRefFile(file) handleUploadConvertRefFile(file)
} else { } else {
swalFire({ if (file && ['image/png', 'image/jpg', 'image/jpeg', 'image/bmp', 'image/gif'].includes(file.type)) {
text: '이미지가 아닙니다.', // file.name.split('.').pop() === 'dwg' ? handleUploadConvertRefFile(file) : handleUploadImageRefFile(file)
type: 'alert', handleUploadImageRefFile(file)
icon: 'error', } else {
}) swalFire({
text: '이미지가 아닙니다.',
type: 'alert',
icon: 'error',
})
}
} }
} }
/** /**
@ -121,14 +126,13 @@ export function useRefFiles() {
} }
const res = await get({ const res = await get({
url: `http://localhost:3000/api/html2canvas?q=${queryRef.current.value}&fileNm=${currentCanvasPlan.id}&zoom=20`, url: `${process.env.NEXT_PUBLIC_HOST_URL}/map/convert?q=${queryRef.current.value}&fileNm=${currentCanvasPlan.id}&zoom=20`,
}) })
console.log('🚀 ~ handleMapImageDown ~ res:', res) console.log('🚀 ~ handleMapImageDown ~ res:', res)
const file = await readImage(res.fileNm) // const file = await readImage(res.fileNm)
console.log('🚀 ~ handleMapImageDown ~ file:', file) // console.log('🚀 ~ handleMapImageDown ~ file:', file)
setCurrentBgImage(file) // setCurrentBgImage(file)
// handleBackImageLoadToCanvas(`plan-images/${currentCanvasPlan.id}.png`) setCurrentBgImage(`${process.env.NEXT_PUBLIC_HOST_URL}${res.filePath}`)
// setCurrentCanvasPlan((prev) => ({ ...prev, bgImageName: currentCanvasPlan.id, mapPositionAddress: queryRef.current.value }))
} }
/** /**
@ -158,7 +162,6 @@ export function useRefFiles() {
console.log('🚀 ~ handleUploadImageRefFile ~ res:', res) console.log('🚀 ~ handleUploadImageRefFile ~ res:', res)
// const image = await readImage(res.filePath) // const image = await readImage(res.filePath)
// console.log('🚀 ~ handleUploadImageRefFile ~ file:', image) // console.log('🚀 ~ handleUploadImageRefFile ~ file:', image)
setCurrentBgImage(`${process.env.NEXT_PUBLIC_HOST_URL}${res.filePath}`) setCurrentBgImage(`${process.env.NEXT_PUBLIC_HOST_URL}${res.filePath}`)
setRefImage(file) setRefImage(file)
} }
@ -171,15 +174,21 @@ export function useRefFiles() {
const formData = new FormData() const formData = new FormData()
formData.append('file', file) formData.append('file', file)
await promisePost({ url: converterUrl, data: formData }) const res = await post({ url: converterUrl, data: formData })
.then((res) => { console.log('🚀 ~ handleUploadConvertRefFile ~ res:', res)
convertDwgToPng(res.data.Files[0].FileName, res.data.Files[0].FileData) const result = await post({ url: `${process.env.NEXT_PUBLIC_HOST_URL}/cad/convert`, data: res })
swalFire({ text: '파일 변환 성공' }) console.log('🚀 ~ handleUploadConvertRefFile ~ result:', result)
setRefImage(res.data.Files[0].FileData) setCurrentBgImage(`${process.env.NEXT_PUBLIC_HOST_URL}${result.filePath}`)
}) setRefImage(res.Files[0].FileData)
.catch((err) => { // await promisePost({ url: converterUrl, data: formData })
swalFire({ text: '파일 변환 실패', icon: 'error' }) // .then((res) => {
}) // convertDwgToPng(res.data.Files[0].FileName, res.data.Files[0].FileData)
// swalFire({ text: '파일 변환 성공' })
// setRefImage(res.data.Files[0].FileData)
// })
// .catch((err) => {
// swalFire({ text: '파일 변환 실패', icon: 'error' })
// })
} }
/** /**

4
src/hooks/common/useRoof.js
View File

@ -16,7 +16,9 @@ export function useRoof() {
.filter((polygon) => polygon.name === 'roof') .filter((polygon) => polygon.name === 'roof')
.forEach((polygon) => { .forEach((polygon) => {
if (allocDisplay) { if (allocDisplay) {
setSurfaceShapePattern(polygon, roofDisplay.column) if (polygon.roofMaterial) {
setSurfaceShapePattern(polygon, roofDisplay.column, false, polygon.roofMaterial, true)
}
} else { } else {
polygon.set('fill', null) polygon.set('fill', null)
} }

14
src/hooks/module/useModule.js
View File

@ -311,7 +311,10 @@ export function useModule() {
canvas.renderAll() canvas.renderAll()
}, },
}) })
} else {
moduleSetupSurface.set({ modules: [...moduleSetupSurface.modules, ...copyModules] })
} }
setModuleStatisticsData()
} }
const moduleMultiCopy = (type, length, direction) => { const moduleMultiCopy = (type, length, direction) => {
@ -385,6 +388,9 @@ export function useModule() {
canvas.renderAll() canvas.renderAll()
}, },
}) })
} else {
moduleSetupSurface.set({ modules: [...moduleSetupSurface.modules, ...copyModules] })
setModuleStatisticsData()
} }
} }
@ -500,6 +506,7 @@ export function useModule() {
}, },
}) })
} }
setModuleStatisticsData()
} }
const moduleRowRemove = (type) => { const moduleRowRemove = (type) => {
@ -615,6 +622,7 @@ export function useModule() {
}, },
}) })
} }
setModuleStatisticsData()
} }
const moduleColumnInsert = (type) => { const moduleColumnInsert = (type) => {
@ -710,6 +718,7 @@ export function useModule() {
}, },
}) })
} }
setModuleStatisticsData()
} }
const muduleRowInsert = (type) => { const muduleRowInsert = (type) => {
@ -807,6 +816,7 @@ export function useModule() {
}, },
}) })
} }
setModuleStatisticsData()
} }
const alignModule = (type, surfaceArray) => { const alignModule = (type, surfaceArray) => {
@ -879,6 +889,7 @@ export function useModule() {
surface.set({ modules: modules }) surface.set({ modules: modules })
canvas.remove(activeModule) canvas.remove(activeModule)
canvas.renderAll() canvas.renderAll()
setModuleStatisticsData()
} }
const moduleRoofRemove = (surfaceArray) => { const moduleRoofRemove = (surfaceArray) => {
@ -961,10 +972,11 @@ export function useModule() {
} }
const setModuleStatisticsData = () => { const setModuleStatisticsData = () => {
if (selectedModules?.length === 0) return
const tempHeader = [ const tempHeader = [
{ name: getMessage('simulator.table.sub1'), prop: 'name' }, { name: getMessage('simulator.table.sub1'), prop: 'name' },
{ name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.circuit'), prop: 'circuit' }, { name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.circuit'), prop: 'circuit' },
...selectedModules.itemList.map((module) => { ...selectedModules?.itemList?.map((module) => {
return { return {
name: module.itemNm, name: module.itemNm,
prop: module.itemId, prop: module.itemId,

66
src/hooks/module/useTrestle.js
View File

@ -5,7 +5,7 @@ import { moduleSelectionDataState } from '@/store/selectedModuleOptions'
import { getDegreeByChon } from '@/util/canvas-util' import { getDegreeByChon } from '@/util/canvas-util'
import { v4 as uuidv4 } from 'uuid' import { v4 as uuidv4 } from 'uuid'
import { useMasterController } from '@/hooks/common/useMasterController' import { useMasterController } from '@/hooks/common/useMasterController'
import { basicSettingState } from '@/store/settingAtom' import { basicSettingState, trestleDisplaySelector } from '@/store/settingAtom'
import { useSwal } from '@/hooks/useSwal' import { useSwal } from '@/hooks/useSwal'
// 회로 및 가대설정 // 회로 및 가대설정
@ -15,8 +15,14 @@ export const useTrestle = () => {
const { getQuotationItem } = useMasterController() const { getQuotationItem } = useMasterController()
const currentAngleType = useRecoilValue(currentAngleTypeSelector) const currentAngleType = useRecoilValue(currentAngleTypeSelector)
const roofSizeSet = useRecoilValue(basicSettingState).roofSizeSet const roofSizeSet = useRecoilValue(basicSettingState).roofSizeSet
const isTrestleDisplay = useRecoilValue(trestleDisplaySelector)
const { swalFire } = useSwal() const { swalFire } = useSwal()
const apply = () => { const apply = () => {
const notAllocationModules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE && !obj.circuit)
if (notAllocationModules.length > 0) {
swalFire({ text: '回路番号が設定されていないモジュールがあります。 番号を設定しなおすか、 パネルを削除してください。', icon: 'error' })
return null
}
try { try {
//처마력바가 체크되어 있는 경우 exposedBottomPoints를 이용해 처마력바 그려줘야함. //처마력바가 체크되어 있는 경우 exposedBottomPoints를 이용해 처마력바 그려줘야함.
// exposedBottomPoints는 노출 최하면 들의 centerPoint 배열. // exposedBottomPoints는 노출 최하면 들의 centerPoint 배열.
@ -51,7 +57,7 @@ export const useTrestle = () => {
let { rackQty, rackIntvlPct, rackYn, cvrPlvrYn } = surface.trestleDetail let { rackQty, rackIntvlPct, rackYn, cvrPlvrYn } = surface.trestleDetail
if (!rack) { if (!rack) {
//25/01/16 기준 랙이 없는 경우는 그냥 안그려준다. //25/02/06 가대없음의 경우 랙정보가 없음
return return
} }
@ -104,8 +110,6 @@ export const useTrestle = () => {
leftExposedHalfTopModules.length > 0 || leftExposedHalfTopModules.length > 0 ||
rightExposedHalfTopPoints.length > 0 rightExposedHalfTopPoints.length > 0
console.log('isChidory', isChidory)
if (plvrYn === 'N' && isChidory) { if (plvrYn === 'N' && isChidory) {
alert('치조불가공법입니다.') alert('치조불가공법입니다.')
clear() clear()
@ -135,6 +139,7 @@ export const useTrestle = () => {
selectable: false, selectable: false,
surfaceId: surface.id, surfaceId: surface.id,
parentId: module.id, parentId: module.id,
visible: isTrestleDisplay,
}) })
canvas.add(eaveBar) canvas.add(eaveBar)
canvas.renderAll() canvas.renderAll()
@ -165,6 +170,7 @@ export const useTrestle = () => {
selectable: false, selectable: false,
surfaceId: surface.id, surfaceId: surface.id,
parentId: module.id, parentId: module.id,
visible: isTrestleDisplay,
}) })
canvas.add(halfEaveBar) canvas.add(halfEaveBar)
canvas.renderAll() canvas.renderAll()
@ -193,6 +199,7 @@ export const useTrestle = () => {
strokeWidth: 4, strokeWidth: 4,
selectable: false, selectable: false,
parentId: module.id, parentId: module.id,
visible: isTrestleDisplay,
}) })
canvas.add(halfEaveBar) canvas.add(halfEaveBar)
canvas.renderAll() canvas.renderAll()
@ -615,7 +622,21 @@ export const useTrestle = () => {
} }
} }
}) })
const params = { trestles: surfaces.map((surface) => surface.quotationParam), pcses }
const allModules = surfaces.map((surface) => surface.modules).flat()
// 모듈 파라미터 생성
const modules = getModulesParam(allModules)
const trestles = []
//가대 파라미터 생성
surfaces.forEach((surface) => {
if (surface.quotationParam) {
trestles.push(surface.quotationParam)
}
})
// trestles 배열에서 null인 경우 제거
const params = { trestles, pcses, modules }
//견적서 itemList 조회 //견적서 itemList 조회
const { data: itemList, data2, result } = await getQuotationItem(params) const { data: itemList, data2, result } = await getQuotationItem(params)
@ -918,7 +939,7 @@ export const useTrestle = () => {
offsetX: 0, offsetX: 0,
offsetY: 0, offsetY: 0,
}, },
visible: isTrestleDisplay,
parentId: module.id, parentId: module.id,
surfaceId: surface.id, surfaceId: surface.id,
supFitQty, supFitQty,
@ -952,6 +973,7 @@ export const useTrestle = () => {
}, },
parentId: module.id, parentId: module.id,
surfaceId: surface.id, surfaceId: surface.id,
visible: isTrestleDisplay,
supFitQty, supFitQty,
supFitIntvlPct, supFitIntvlPct,
rackLen, rackLen,
@ -992,6 +1014,7 @@ export const useTrestle = () => {
}, },
parentId: module.id, parentId: module.id,
surfaceId: surface.id, surfaceId: surface.id,
visible: isTrestleDisplay,
supFitQty, supFitQty,
supFitIntvlPct, supFitIntvlPct,
rackLen: rackLength, rackLen: rackLength,
@ -1022,6 +1045,7 @@ export const useTrestle = () => {
surfaceId: surface.id, surfaceId: surface.id,
strokeWidth: 4, strokeWidth: 4,
selectable: false, selectable: false,
visible: isTrestleDisplay,
supFitQty, supFitQty,
supFitIntvlPct, supFitIntvlPct,
rackLen, rackLen,
@ -1062,6 +1086,7 @@ export const useTrestle = () => {
}, },
parentId: module.id, parentId: module.id,
surfaceId: surface.id, surfaceId: surface.id,
visible: isTrestleDisplay,
supFitQty, supFitQty,
supFitIntvlPct, supFitIntvlPct,
rackLen: rackLength, rackLen: rackLength,
@ -1090,6 +1115,7 @@ export const useTrestle = () => {
}, },
parentId: module.id, parentId: module.id,
surfaceId: surface.id, surfaceId: surface.id,
visible: isTrestleDisplay,
strokeWidth: 4, strokeWidth: 4,
selectable: false, selectable: false,
supFitQty, supFitQty,
@ -1130,6 +1156,7 @@ export const useTrestle = () => {
}, },
parentId: module.id, parentId: module.id,
surfaceId: surface.id, surfaceId: surface.id,
visible: isTrestleDisplay,
supFitQty, supFitQty,
supFitIntvlPct, supFitIntvlPct,
rackLen, rackLen,
@ -1158,6 +1185,7 @@ export const useTrestle = () => {
}, },
parentId: module.id, parentId: module.id,
surfaceId: surface.id, surfaceId: surface.id,
visible: isTrestleDisplay,
strokeWidth: 4, strokeWidth: 4,
selectable: false, selectable: false,
supFitQty, supFitQty,
@ -1209,6 +1237,7 @@ export const useTrestle = () => {
fill: 'green', fill: 'green',
name: 'bracket', name: 'bracket',
parentId: rack.parentId, parentId: rack.parentId,
visible: isTrestleDisplay,
surfaceId: surface.id, surfaceId: surface.id,
width: bracketLength, width: bracketLength,
height: bracketLength, height: bracketLength,
@ -1228,6 +1257,7 @@ export const useTrestle = () => {
fill: 'green', fill: 'green',
name: 'bracket', name: 'bracket',
parentId: rack.parentId, parentId: rack.parentId,
visible: isTrestleDisplay,
surfaceId: surface.id, surfaceId: surface.id,
width: bracketLength, width: bracketLength,
height: bracketLength, height: bracketLength,
@ -1246,6 +1276,7 @@ export const useTrestle = () => {
top: y2 - bracketLength / 3, top: y2 - bracketLength / 3,
fill: 'green', fill: 'green',
parentId: rack.parentId, parentId: rack.parentId,
visible: isTrestleDisplay,
surfaceId: surface.id, surfaceId: surface.id,
name: 'bracket', name: 'bracket',
width: bracketLength, width: bracketLength,
@ -1266,6 +1297,7 @@ export const useTrestle = () => {
fill: 'green', fill: 'green',
name: 'bracket', name: 'bracket',
parentId: rack.parentId, parentId: rack.parentId,
visible: isTrestleDisplay,
surfaceId: surface.id, surfaceId: surface.id,
width: bracketLength, width: bracketLength,
height: bracketLength, height: bracketLength,
@ -1431,6 +1463,7 @@ export const useTrestle = () => {
width: 10, width: 10,
height: 10, height: 10,
selectable: false, selectable: false,
visible: isTrestleDisplay,
}) })
canvas.add(bracket) canvas.add(bracket)
canvas.renderAll() canvas.renderAll()
@ -1867,7 +1900,7 @@ export const useTrestle = () => {
cvrYn: moduleSelection.construction.setupCover ? 'Y' : 'N', cvrYn: moduleSelection.construction.setupCover ? 'Y' : 'N',
snowGdYn: moduleSelection.construction.setupSnowCover ? 'Y' : 'N', snowGdYn: moduleSelection.construction.setupSnowCover ? 'Y' : 'N',
plvrYn: cvrPlvrYn, plvrYn: cvrPlvrYn,
modules: getModules(surface), // modules: getModules(surface), // 2025-02-06 api 수정
trestleMkrCd, trestleMkrCd,
constMthdCd, constMthdCd,
roofBaseCd, roofBaseCd,
@ -1879,10 +1912,9 @@ export const useTrestle = () => {
} }
} }
const getModules = (surface) => { // 전체 모듈 파라미터 생성
const { modules } = surface const getModulesParam = (allModules) => {
const params = allModules.map((module, index) => {
const params = modules.map((module, index) => {
return { return {
moduleTpCd: module.moduleInfo.itemTp, moduleTpCd: module.moduleInfo.itemTp,
moduleItemId: module.moduleInfo.itemId, moduleItemId: module.moduleInfo.itemId,
@ -2200,5 +2232,15 @@ export const useTrestle = () => {
}) })
} }
return { apply, getTrestleParams, clear } // 전모듈 의 회로번호 visible false 처리
// 가대 설치 전 필요
const setViewCircuitNumberTexts = (visible) => {
const circuitNumberTexts = canvas.getObjects().filter((obj) => obj.name === 'circuitNumber')
circuitNumberTexts.forEach((text) => {
text.visible = visible
})
canvas.renderAll()
}
return { apply, getTrestleParams, clear, setViewCircuitNumberTexts }
} }

9
src/hooks/option/useCanvasSetting.js
View File

@ -727,7 +727,7 @@ export function useCanvasSetting() {
for (let i = 0; i < option1.length; i++) { for (let i = 0; i < option1.length; i++) {
switch (option1[i].column) { switch (option1[i].column) {
case 'allocDisplay': //할당 표시 case 'allocDisplay': //할당 표시
optionName = ['1'] optionName = []
break break
case 'outlineDisplay': //외벽선 표시 case 'outlineDisplay': //외벽선 표시
optionName = ['outerLine', POLYGON_TYPE.WALL] optionName = ['outerLine', POLYGON_TYPE.WALL]
@ -742,19 +742,20 @@ export function useCanvasSetting() {
optionName = ['commonText'] optionName = ['commonText']
break break
case 'circuitNumDisplay': //회로번호 표시 case 'circuitNumDisplay': //회로번호 표시
optionName = ['7'] optionName = ['circuitNumber']
break break
case 'flowDisplay': //흐름방향 표시 case 'flowDisplay': //흐름방향 표시
optionName = ['arrow', 'flowText'] optionName = ['arrow', 'flowText']
break break
case 'trestleDisplay': //가대 표시 case 'trestleDisplay': //가대 표시
optionName = ['8'] optionName = ['rack', 'smartRack', 'bracket', 'eaveBar', 'halfEaveBar']
break break
case 'imageDisplay': //이미지 표시 case 'imageDisplay': //이미지 표시
optionName = ['9'] optionName = ['9']
break break
case 'totalDisplay': //집계표 표시 case 'totalDisplay': //집계표 표시
optionName = ['10'] // 작업할 필요 없음
optionName = []
break break
} }
// 표시 선택 상태(true/false) // 표시 선택 상태(true/false)

6
src/hooks/roofcover/useRoofAllocationSetting.js
View File

@ -445,9 +445,9 @@ export function useRoofAllocationSetting(id) {
setCurrentRoofList(newRoofList) setCurrentRoofList(newRoofList)
} }
const handleChangeInput = (e, type, index) => { const handleChangeInput = (e, type = '', index) => {
const value = e.target.value const value = e.target.value
if (type === 'pitch') { /*if (type === 'pitch') {
// type이 pitch인 경우 소수점 1자리까지만 입력 가능 // type이 pitch인 경우 소수점 1자리까지만 입력 가능
const reg = /^[0-9]+(\.[0-9]{0,1})?$/ const reg = /^[0-9]+(\.[0-9]{0,1})?$/
@ -481,7 +481,7 @@ export function useRoofAllocationSetting(id) {
} }
return return
} }*/
const newRoofList = currentRoofList.map((roof, idx) => { const newRoofList = currentRoofList.map((roof, idx) => {
if (idx === index) { if (idx === index) {

14
src/hooks/roofcover/useRoofShapePassivitySetting.js
View File

@ -203,6 +203,20 @@ export function useRoofShapePassivitySetting(id) {
const roofBases = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) const roofBases = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
const exceptObjs = canvas.getObjects().filter((obj) => obj.name !== 'outerLine' && obj.parent?.name !== 'outerLine') const exceptObjs = canvas.getObjects().filter((obj) => obj.name !== 'outerLine' && obj.parent?.name !== 'outerLine')
const lines = canvas.getObjects().filter((obj) => obj.name === 'outerLine') const lines = canvas.getObjects().filter((obj) => obj.name === 'outerLine')
let checkedAllSetting = true
lines.forEach((line) => {
if (!line.attributes) {
checkedAllSetting = false
}
})
if (!checkedAllSetting) {
swalFire({ text: '설정이 완료되지 않은 외벽선이 있습니다.', icon: 'warning' })
return
}
exceptObjs.forEach((obj) => { exceptObjs.forEach((obj) => {
canvas.remove(obj) canvas.remove(obj)
}) })

7
src/hooks/useEstimate.js
View File

@ -7,11 +7,13 @@ import { useAxios } from '@/hooks/useAxios'
import { useSwal } from '@/hooks/useSwal' import { useSwal } from '@/hooks/useSwal'
import { usePlan } from '@/hooks/usePlan' import { usePlan } from '@/hooks/usePlan'
import { GlobalDataContext } from '@/app/GlobalDataProvider' import { GlobalDataContext } from '@/app/GlobalDataProvider'
import { QcastContext } from '@/app/QcastProvider'
import { currentCanvasPlanState } from '@/store/canvasAtom' import { currentCanvasPlanState } from '@/store/canvasAtom'
import { loginUserStore } from '@/store/commonAtom' import { loginUserStore } from '@/store/commonAtom'
export function useEstimate() { export function useEstimate() {
const { managementStateLoaded } = useContext(GlobalDataContext) const { managementStateLoaded } = useContext(GlobalDataContext)
const { setIsGlobalLoading } = useContext(QcastContext)
const router = useRouter() const router = useRouter()
const loginUserState = useRecoilValue(loginUserStore) const loginUserState = useRecoilValue(loginUserStore)
const currentCanvasPlan = useRecoilValue(currentCanvasPlanState) const currentCanvasPlan = useRecoilValue(currentCanvasPlanState)
@ -24,6 +26,9 @@ export function useEstimate() {
* 도면 견적서 저장 * 도면 견적서 저장
*/ */
const saveEstimate = async (estimateParam) => { const saveEstimate = async (estimateParam) => {
// 로딩 임시 주석
// setIsGlobalLoading(true)
const userId = loginUserState.userId const userId = loginUserState.userId
const saleStoreId = managementStateLoaded.saleStoreId const saleStoreId = managementStateLoaded.saleStoreId
const objectNo = currentCanvasPlan.objectNo const objectNo = currentCanvasPlan.objectNo
@ -54,7 +59,7 @@ export function useEstimate() {
await promisePost({ url: '/api/estimate/save-estimate', data: saveEstimateData }) await promisePost({ url: '/api/estimate/save-estimate', data: saveEstimateData })
.then(async () => { .then(async () => {
// 견적서 저장이 완료되면 캔버스 저장 후 견적서 페이지로 이동 // 견적서 저장이 완료되면 캔버스 저장 후 견적서 페이지로 이동
await saveCanvas() await saveCanvas(false)
moveEstimate(planNo, objectNo) moveEstimate(planNo, objectNo)
}) })
.catch((error) => { .catch((error) => {

4
src/hooks/useMouse.js
View File

@ -11,10 +11,10 @@ export function useMouse() {
const mouseLines = canvas.getObjects().filter((obj) => obj.name === 'mouseLine') const mouseLines = canvas.getObjects().filter((obj) => obj.name === 'mouseLine')
if (mouseLines.length < 2) { if (mouseLines.length < 2) {
return pointer return { x: Math.round(pointer.x), y: Math.round(pointer.y) }
} }
return getInterSectionLineNotOverCoordinate(mouseLines[0], mouseLines[1]) || pointer return getInterSectionLineNotOverCoordinate(mouseLines[0], mouseLines[1]) || { x: Math.round(pointer.x), y: Math.round(pointer.y) }
} }
return { return {

18
src/hooks/usePlan.js
View File

@ -120,9 +120,9 @@ export function usePlan(params = {}) {
/** /**
* 페이지 내 캔버스를 저장 * 페이지 내 캔버스를 저장
*/ */
const saveCanvas = async () => { const saveCanvas = async (saveAlert = true) => {
const canvasStatus = currentCanvasData('save') const canvasStatus = currentCanvasData('save')
await putCanvasStatus(canvasStatus) await putCanvasStatus(canvasStatus, saveAlert)
} }
/** /**
@ -192,7 +192,7 @@ export function usePlan(params = {}) {
/** /**
* id에 해당하는 canvas 데이터를 수정 * id에 해당하는 canvas 데이터를 수정
*/ */
const putCanvasStatus = async (canvasStatus) => { const putCanvasStatus = async (canvasStatus, saveAlert = true) => {
const planData = { const planData = {
id: currentCanvasPlan.id, id: currentCanvasPlan.id,
bgImageName: currentCanvasPlan?.bgImageName ?? null, bgImageName: currentCanvasPlan?.bgImageName ?? null,
@ -202,7 +202,7 @@ export function usePlan(params = {}) {
await promisePut({ url: '/api/canvas-management/canvas-statuses', data: planData }) await promisePut({ url: '/api/canvas-management/canvas-statuses', data: planData })
.then((res) => { .then((res) => {
setPlans((plans) => plans.map((plan) => (plan.id === currentCanvasPlan.id ? { ...plan, canvasStatus: canvasStatus } : plan))) setPlans((plans) => plans.map((plan) => (plan.id === currentCanvasPlan.id ? { ...plan, canvasStatus: canvasStatus } : plan)))
swalFire({ text: getMessage('plan.message.save') }) if (saveAlert) swalFire({ text: getMessage('plan.message.save') })
}) })
.catch((error) => { .catch((error) => {
swalFire({ text: error.message, icon: 'error' }) swalFire({ text: error.message, icon: 'error' })
@ -238,7 +238,9 @@ export function usePlan(params = {}) {
if (res.status === 200) { if (res.status === 200) {
const estimateDetail = res.data const estimateDetail = res.data
if (pathname === '/floor-plan/estimate/5') { if (pathname === '/floor-plan/estimate/5') {
if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) { // 견적서 이동 조건 수정
// if (estimateDetail.tempFlg === '0' && estimateDetail.estimateDate !== null) {
if (estimateDetail.estimateDate !== null) {
res.data.resetFlag = 'N' res.data.resetFlag = 'N'
if (res.data.itemList.length > 0) { if (res.data.itemList.length > 0) {
@ -263,7 +265,7 @@ export function usePlan(params = {}) {
} }
} else { } else {
// 발전시뮬레이션 // 발전시뮬레이션
if (estimateDetail.tempFlg === '0') { if (estimateDetail.estimateDate !== null) {
setCurrentCanvasPlan(plans.find((plan) => plan.id === newCurrentId)) setCurrentCanvasPlan(plans.find((plan) => plan.id === newCurrentId))
setPlans((plans) => plans.map((plan) => ({ ...plan, isCurrent: plan.id === newCurrentId }))) setPlans((plans) => plans.map((plan) => ({ ...plan, isCurrent: plan.id === newCurrentId })))
} else { } else {
@ -281,7 +283,7 @@ export function usePlan(params = {}) {
}) })
} else { } else {
if (!currentCanvasPlan || currentCanvasPlan.id !== newCurrentId) { if (!currentCanvasPlan || currentCanvasPlan.id !== newCurrentId) {
await saveCanvas() await saveCanvas(true)
} }
setCurrentCanvasPlan(plans.find((plan) => plan.id === newCurrentId)) setCurrentCanvasPlan(plans.find((plan) => plan.id === newCurrentId))
setPlans((plans) => plans.map((plan) => ({ ...plan, isCurrent: plan.id === newCurrentId }))) setPlans((plans) => plans.map((plan) => ({ ...plan, isCurrent: plan.id === newCurrentId })))
@ -314,7 +316,7 @@ export function usePlan(params = {}) {
*/ */
const handleAddPlan = async (userId, objectNo) => { const handleAddPlan = async (userId, objectNo) => {
if (currentCanvasPlan?.id) { if (currentCanvasPlan?.id) {
await saveCanvas() await saveCanvas(true)
} }
JSON.parse(currentCanvasData()).objects.length > 0 JSON.parse(currentCanvasData()).objects.length > 0
? swalFire({ ? swalFire({

10
src/hooks/usePolygon.js
View File

@ -61,12 +61,18 @@ export const usePolygon = () => {
let left, top let left, top
if (line.direction === 'left' || line.direction === 'right') { if (line.direction === 'right') {
left = (x1 + x2) / 2 left = (x1 + x2) / 2
top = (y1 + y2) / 2 + 10 top = (y1 + y2) / 2 + 10
} else if (line.direction === 'top' || line.direction === 'bottom') { } else if (line.direction === 'top') {
left = (x1 + x2) / 2 + 10 left = (x1 + x2) / 2 + 10
top = (y1 + y2) / 2 top = (y1 + y2) / 2
} else if (line.direction === 'left') {
left = (x1 + x2) / 2
top = (y1 + y2) / 2 - 30
} else if (line.direction === 'bottom') {
left = (x1 + x2) / 2 - 50
top = (y1 + y2) / 2
} }
const minX = line.left const minX = line.left

63
src/lib/authActions.js
View File

@ -16,9 +16,7 @@ export async function getSession() {
let session let session
session = await getIronSession(cookies(), sessionOptions) session = await getIronSession(cookies(), sessionOptions)
console.log('session:', session)
if (!session.isLoggedIn) { if (!session.isLoggedIn) {
// session.isLoggedIn = defaultSession.isLoggedIn
session.isLoggedIn = false session.isLoggedIn = false
} }
@ -27,10 +25,6 @@ export async function getSession() {
export async function checkSession() { export async function checkSession() {
const session = await getSession() const session = await getSession()
// if (!session.isLoggedIn) {
// redirect('/login')
// }
return session.isLoggedIn return session.isLoggedIn
} }
@ -54,7 +48,6 @@ export async function setSession(data) {
session.pwdInitYn = data.pwdInitYn session.pwdInitYn = data.pwdInitYn
session.custCd = data.custCd session.custCd = data.custCd
session.isLoggedIn = true session.isLoggedIn = true
// console.log('session:', session)
await session.save() await session.save()
} }
@ -64,31 +57,33 @@ export async function login() {
if (session) { if (session) {
redirect('/') redirect('/')
} }
}
// const userId = formData.get('id')
// const password = formData.get('password') export const customSetMenuNumber = async ({ objectNo, pid, menuNum, callback = () => {} }) => {
let db = null
// console.log('id:', userId)
// console.log('password:', password) if (!db) {
db = await open({
// // const loginUser = await getUserByIdAndPassword({ userId, password }) filename: 'qcast3.global.sqlite',
// const loginUser = { driver: sqlite3.Database,
// id: 1, })
// userId: 'test123', }
// name: 'jinsoo Kim',
// email: 'jinsoo.kim@example.com', const chkSql = `SELECT menu_num FROM current_menu WHERE object_no = ? AND pid = ?`
// } const prevMenuNum = await getInstance().get(chkSql, objectNo, pid)
// if (!loginUser) { if (prevMenuNum) {
// throw Error('Wrong Credentials!') if (prevMenuNum > menuNum) {
// } callback()
} else {
// session.name = loginUser.name const sql = `UPDATE current_menu SET menu_num = ? WHERE object_no = ? AND pid = ?`
// session.userId = loginUser.userId await getInstance().run(sql, menuNum, objectNo, pid)
// session.email = loginUser.email
// session.isLoggedIn = true setMenuNumber(menuNum)
// console.log('session:', session) }
} else {
// await session.save() const sql = `INSERT INTO current_menu (object_no, pid, menu_num) VALUES (?, ?, ?)`
// redirect('/') await getInstance().run(sql, objectNo, pid, menuNum)
setMenuNumber(menuNum)
}
} }

11
src/lib/fileAction.js
View File

@ -72,16 +72,7 @@ const writeImage = async (fileName, file) => {
} }
const readImage = async (fileName) => { const readImage = async (fileName) => {
// const file = await fs.readFile(`${FILE_PATH}/${fileName}`)
const file = await fs.readFile(`${process.env.NEXT_PUBLIC_HOST_URL}${fileName}`) const file = await fs.readFile(`${process.env.NEXT_PUBLIC_HOST_URL}${fileName}`)
// .then((res) => {
// console.log('readImage-then', res)
// })
// .catch((e) => {
// console.log('readImage-catch', e)
// })
console.log('🚀 ~ readImage ~ file:', file)
return file return file
} }
@ -89,7 +80,7 @@ const removeImage = async (fileName) => {
try { try {
await fs.rm(`${FILE_PATH}/${fileName}.png`) await fs.rm(`${FILE_PATH}/${fileName}.png`)
} catch (e) { } catch (e) {
console.log(e) // Error handling without console.log
} }
} }

10
src/store/menuAtom.js
View File

@ -64,11 +64,11 @@ export const subMenusState = atom({
name: 'plan.menu.module.circuit.setting.circuit.trestle.setting', name: 'plan.menu.module.circuit.setting.circuit.trestle.setting',
menu: MENU.MODULE_CIRCUIT_SETTING.CIRCUIT_TRESTLE_SETTING, menu: MENU.MODULE_CIRCUIT_SETTING.CIRCUIT_TRESTLE_SETTING,
}, },
{ // {
id: 2, // id: 2,
name: 'plan.menu.module.circuit.setting.plan.orientation', // name: 'plan.menu.module.circuit.setting.plan.orientation',
menu: MENU.MODULE_CIRCUIT_SETTING.PLAN_ORIENTATION, // menu: MENU.MODULE_CIRCUIT_SETTING.PLAN_ORIENTATION,
}, // },
], ],
}, },
}) })

1
src/util/qpolygon-utils.js
View File

@ -235,6 +235,7 @@ export default function offsetPolygon(vertices, offset) {
const arcSegments = 0 const arcSegments = 0
const originPolygon = new QPolygon(vertices, { fontSize: 0 }) const originPolygon = new QPolygon(vertices, { fontSize: 0 })
originPolygon.setViewLengthText(false)
if (offset > 0) { if (offset > 0) {
let result = createMarginPolygon(polygon, offset, arcSegments).vertices let result = createMarginPolygon(polygon, offset, arcSegments).vertices