From 776a030eaddced3b695fb6edbd48faf80a7e4cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?sanguu=28=EB=B0=95=EC=83=81=ED=98=84=29?= Date: Fri, 23 Dec 2022 15:28:59 +0900 Subject: [PATCH] =?UTF-8?q?=EB=93=9C=EB=A1=A0=EA=B4=80=EC=A0=9C=20?= =?UTF-8?q?=EB=B9=84=ED=96=89=20=ED=83=80=EC=9E=85=20=EC=A3=BC=EC=86=8C=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/modules/control/gp/models/controlGpModel.ts | 5 +++++ src/modules/control/gp/sagas/controlGpSaga.ts | 1 + src/views/control/main/ControlMain.js | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index 57dcd5a..9a644ed 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ -REACT_APP_HOST = http://localhost:8080/ -REACT_APP_WS_HOST = ws://localhost:8081/ws +REACT_APP_HOST = http://192.168.0.26:8080/ +REACT_APP_WS_HOST = ws://192.168.0.26:8081/ws REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/ diff --git a/src/modules/control/gp/models/controlGpModel.ts b/src/modules/control/gp/models/controlGpModel.ts index 3495c8c..027af6b 100644 --- a/src/modules/control/gp/models/controlGpModel.ts +++ b/src/modules/control/gp/models/controlGpModel.ts @@ -70,6 +70,11 @@ export interface ControlDetailData { hpno: string; telno: string; items: []; + area1: string; + area2: string; + area3: string; + landNm: string; + landNum: string; } export interface ControlGpDtlData { diff --git a/src/modules/control/gp/sagas/controlGpSaga.ts b/src/modules/control/gp/sagas/controlGpSaga.ts index 3aeadf0..64c9ecd 100644 --- a/src/modules/control/gp/sagas/controlGpSaga.ts +++ b/src/modules/control/gp/sagas/controlGpSaga.ts @@ -147,6 +147,7 @@ function* controlDtlSaga( //날씨 api 호출 const res = yield call(controlGpApi.apiweather, rq); const { data } = yield call(controlGpApi.getDetail, controlId); + yield put( Actions.controlGpDtlAction.success({ ...data, diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js index 0f7f3d7..1344655 100644 --- a/src/views/control/main/ControlMain.js +++ b/src/views/control/main/ControlMain.js @@ -185,9 +185,9 @@ const ControlMain = () => {
- {!isClickObject ? '인천광역시' : controlDetail?.stAreaNm} + {!isClickObject ? '인천광역시' : !controlDetail?.stAreaNm ? `${controlDetail?.res.area1} ${controlDetail?.res.area2} ${controlDetail?.res.area3} ${controlDetail?.res.landNm} ${controlDetail?.res.landNum} ` : controlDetail?.stAreaNm} - {weathericon()} +  {weathericon()}