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

Merge pull request 'dev' (#926) from dev into dev-deploy

Browse Source 
Reviewed-on: #926
This commit is contained in:
ysCha 2026-06-19 16:40:58 +09:00
commit cde1ffb0ea
8 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.development
View File

@ -17,6 +17,7 @@ CONVERTER_API_TOKEN="mcHqQkSZP30vxCRpIWJV62ciBYT887RI"
NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="https://q-order-dev.q-cells.jp/eos/login/autoLogin"
NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="https://q-musubi-dev.q-cells.jp/qm/login/autoLogin"
NEXT_PUBLIC_ECONOMIC_SIMULATION_URL="https://q-order-dev.q-cells.jp/eos/simulation/list"
NEXT_PUBLIC_ECONOMIC_SIMULATION_DETAIL_URL="https://q-order-dev.q-cells.jp/eos/simulation/detail"
# 테스트용
# AWS_REGION="ap-northeast-2"

1
.env.local.dev
View File

@ -15,6 +15,7 @@ NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secr
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_ECONOMIC_SIMULATION_URL="http://q-order-stg.q-cells.jp:8120/eos/simulation/list"
NEXT_PUBLIC_ECONOMIC_SIMULATION_DETAIL_URL="http://q-order-stg.q-cells.jp:8120/eos/simulation/detail"
# 테스트용
# AWS_REGION="ap-northeast-2"

1
.env.localhost
View File

@ -17,6 +17,7 @@ CONVERTER_API_TOKEN="mcHqQkSZP30vxCRpIWJV62ciBYT887RI"
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_ECONOMIC_SIMULATION_URL="http://q-order-stg.q-cells.jp:8120/eos/simulation/list"
NEXT_PUBLIC_ECONOMIC_SIMULATION_DETAIL_URL="http://q-order-stg.q-cells.jp:8120/eos/simulation/detail"
# 테스트용
# AWS_REGION="ap-northeast-2"

1
.env.production
View File

@ -17,6 +17,7 @@ CONVERTER_API_TOKEN="mcHqQkSZP30vxCRpIWJV62ciBYT887RI"
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_ECONOMIC_SIMULATION_URL="https://q-order.q-cells.jp/eos/simulation/list"
NEXT_PUBLIC_ECONOMIC_SIMULATION_DETAIL_URL="https://q-order.q-cells.jp/eos/simulation/detail"
# AWS_REGION="ap-northeast-2"
# AMPLIFY_BUCKET="interplug"

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

@ -105,6 +105,20 @@ export default function CanvasMenu(props) {
// 발전시뮬레이션 메뉴 이동
const { objectNo, pid } = floorPlanState
const openEconomicSimulation = async (objectNo, planNo) => {
const encRes = await promiseGet({
url: '/api/pwrGnrSimulation/encData',
option: { params: { saleStoreId: sessionState.storeId, userId: sessionState.userId } },
})
const { encSaleStoreId, encUserId } = encRes.data
if (!encSaleStoreId || !encUserId) return
window.open(
`${process.env.NEXT_PUBLIC_ECONOMIC_SIMULATION_DETAIL_URL}?authYn=Y&encStoreId=${encodeURIComponent(encSaleStoreId)}&encRegId=${encodeURIComponent(encUserId)}&stuffNo=${objectNo}&planNo=${planNo}`,
'economicSimulation',
`height=${screen.height},width=${screen.width},fullscreen=yes`
)
}
// 발전시물레이션 Excel/PDF 다운
const { promiseGet, promisePost } = useAxios(globalLocale)
const pwrGnrSimTypeRecoil = useRecoilValue(pwrGnrSimTypeState)
@ -294,15 +308,30 @@ export default function CanvasMenu(props) {
}
})
break
case 'economicSimulation':
setIsGlobalLoading(true)
promiseGet({ url: `/api/estimate/${objectNo}/${selectedPlan?.planNo ?? pid}/detail` }).then(async (res) => {
if (res.status === 200) {
const estimateDetail = res.data
if (estimateDetail.estimateDate !== null && estimateDetail.docNo) {
setIsGlobalLoading(false)
await openEconomicSimulation(objectNo, selectedPlan?.planNo ?? pid)
} else {
setIsGlobalLoading(false)
swalFire({ text: getMessage('simulator.menu.move.valid1') })
}
}
})
break
}
if (menu.type !== 'simulation' && menu.type !== 'estimate' && menu.type !== 'drawing') {
if (menu.type !== 'simulation' && menu.type !== 'estimate' && menu.type !== 'drawing' && menu.type !== 'economicSimulation') {
setSelectedMenu(menu.type)
setCurrentMenu(menu.title)
}
if (pathname !== '/floor-plan') {
//견적서 or 발전시뮬레이션 탭에서 같은 탭 클릭시 화면 이동했다 돌아오지않도록..
if (menu.type !== 'drawing' && menu.type !== 'estimate' && menu.type !== 'simulation') {
if (menu.type !== 'drawing' && menu.type !== 'estimate' && menu.type !== 'simulation' && menu.type !== 'economicSimulation') {
router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)
}
}

1
src/locales/ja.json
View File

@ -249,6 +249,7 @@
"plan.menu.estimate.unLock": "ロック解除",
"plan.menu.estimate.lock": "ロック",
"plan.menu.simulation": "発電シミュレーション",
"plan.menu.economic.simulation": "経済シミュレーション",
"plan.menu.simulation.excel": "Excel",
"plan.menu.simulation.pdf": "PDF",
"plan.mode.vertical.horizontal": "垂直水平モード",

1
src/locales/ko.json
View File

@ -249,6 +249,7 @@
"plan.menu.estimate.unLock": "잠금 해제",
"plan.menu.estimate.lock": "잠금",
"plan.menu.simulation": "발전 시뮬레이션",
"plan.menu.economic.simulation": "경제 시뮬레이션",
"plan.menu.simulation.excel": "Excel",
"plan.menu.simulation.pdf": "PDF",
"plan.mode.vertical.horizontal": "수직 수평 모드",

5
src/store/menuAtom.js
View File

@ -36,7 +36,10 @@ export const menusState = atom({
icon: 'con05',
title: MENU.POWER_GENERATION_SIMULATION.DEFAULT,
},
],
process.env.NEXT_PUBLIC_RUN_MODE !== 'production'
? { type: 'economicSimulation', name: 'plan.menu.economic.simulation', icon: 'con05', title: '' }
: null,
].filter(Boolean),
})
export const subMenusState = atom({