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 1/4] =?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()}
From b23a4f088ae09f9755a2c3d34e67dbddda842abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kimjh=28=EA=B9=80=EC=9E=A5=ED=98=84=29?= Date: Thu, 5 Jan 2023 15:36:41 +0900 Subject: [PATCH 2/4] test --- .env | 5 ----- .env.development | 14 -------------- .env.production | 14 -------------- 3 files changed, 33 deletions(-) delete mode 100644 .env delete mode 100644 .env.development delete mode 100644 .env.production diff --git a/.env b/.env deleted file mode 100644 index 0e64c11..0000000 --- a/.env +++ /dev/null @@ -1,5 +0,0 @@ -SKIP_PREFLIGHT_CHECK=true -REACT_APP_BASENAME= "" -REACT_APP_HOST = http://control-api.palnet.co.kr/ -REACT_APP_WS_HOST = ws://control-websocket.palnet.co.kr/ws -REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/ diff --git a/.env.development b/.env.development deleted file mode 100644 index 9a644ed..0000000 --- a/.env.development +++ /dev/null @@ -1,14 +0,0 @@ -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/ - -# Naver Search API HOST -NAVER_SEARCH_API_HOST = https://openapi.naver.com/v1/search/local.json - -#windy API KEY -REACT_WINDY_KEY = wf6Lkn1MAtqcgyW78xbceFHBz6ccsUo8 - -# API KEY -NAVER_APP_CLIENT_KEY = WGEct3bJhQC0pyMsP_GK -NAVER_APP_SECRET_KEY = Q4K4OtUYol \ No newline at end of file diff --git a/.env.production b/.env.production deleted file mode 100644 index 5f7901f..0000000 --- a/.env.production +++ /dev/null @@ -1,14 +0,0 @@ -REACT_APP_HOST = http://pav.palntour.com:8080/ -REACT_APP_WS_HOST = ws://pav.palntour.com:8081/ws -REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/ - -# Naver Search API HOST -NAVER_SEARCH_API_HOST = https://openapi.naver.com/v1/search/local.json - -#windy API KEY -REACT_WINDY_KEY = 8ynJ7tneZjmRxLmHQPGaDPGsGabgQhkC - -# API KEY -NAVER_APP_CLIENT_KEY = WGEct3bJhQC0pyMsP_GK -NAVER_APP_SECRET_KEY = Q4K4OtUYol - From 7d68dc66d8090cbfbb06773897befc123c6276df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kimjh=28=EA=B9=80=EC=9E=A5=ED=98=84=29?= Date: Thu, 5 Jan 2023 15:48:31 +0900 Subject: [PATCH 3/4] bot test --- README.md | Bin 26 -> 38 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/README.md b/README.md index 116796bb17bfd59f142689c69bafed6b2fa87e6d..15f8b2e4118b3b7c14d1e2d1c6d638cfd934fe26 100644 GIT binary patch delta 21 dcmb1An;<5jz`$}fVaJY3SB~D Date: Mon, 15 May 2023 20:07:22 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=98=81=EC=83=81=20=EB=B2=84=ED=8A=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/control/report/ControlReportList.js | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/views/control/report/ControlReportList.js b/src/views/control/report/ControlReportList.js index ffbe173..4e7e6ae 100644 --- a/src/views/control/report/ControlReportList.js +++ b/src/views/control/report/ControlReportList.js @@ -61,21 +61,17 @@ const ControlReportList = props => { {controlGpList?.map(item => { if (item.objectId && item.objectId.indexOf(filterId) != -1) { return ( -
handlerDetail(item)} - key={item.objectId} - > +
-
+
handlerDetail(item)}>
식별번호
{item.objectId}
-
+
handlerDetail(item)}>
이륙 위치
-
-
+
handlerDetail(item)}>
이륙 시간
{item.controlStartDt @@ -85,7 +81,7 @@ const ControlReportList = props => { : '-'}
-
+
handlerDetail(item)}>
속도(고도)
{item.speed ? item.speed : '-'}{' '} @@ -94,12 +90,23 @@ const ControlReportList = props => { {item.elev ? item.elevType : ''})
-
+
handlerDetail(item)}>
상태
{item.dronStatus ? item.dronStatus : '-'}
+
+ +
);