Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

.env

@@ -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/

.env.development

@@ -1,14 +0,0 @@
-REACT_APP_HOST = http://localhost:8080/
-REACT_APP_WS_HOST = ws://localhost: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

.env.production

@@ -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
-

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 {

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,

src/views/control/main/ControlMain.js

@@ -185,9 +185,9 @@ const ControlMain = () => {
           <Card>
             <div className='data-box-header'>
               <span className='box-ti'>
-                {!isClickObject ? '인천광역시' : controlDetail?.stAreaNm}
+                {!isClickObject ? '인천광역시' : !controlDetail?.stAreaNm ? `${controlDetail?.res.area1} ${controlDetail?.res.area2} ${controlDetail?.res.area3} ${controlDetail?.res.landNm} ${controlDetail?.res.landNum} ` : controlDetail?.stAreaNm}
               </span>
-              <span className=''>{weathericon()}</span>
+              <span className=''>&nbsp;{weathericon()}</span>
             </div>
             <div className='data-list-box'>
               <div className='data-list'>

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 (
-              <div
+              <div className='layer-content-list' key={item.objectId}>
-                className='layer-content-list'
-                onClick={() => handlerDetail(item)}
-                key={item.objectId}
-              >
                 <dl>
-                  <dt>
+                  <dt onClick={() => handlerDetail(item)}>
                     <div className='list-left-txt'>식별번호</div>
                     <div className='list-right-txt'>{item.objectId}</div>
                   </dt>
-                  <dt>
+                  <dt onClick={() => handlerDetail(item)}>
                     <div className='list-left-txt'>이륙 위치</div>
                     <div className='list-right-txt'>-</div>
                   </dt>
-                  <dt>
+                  <dt onClick={() => handlerDetail(item)}>
                     <div className='list-left-txt'>이륙 시간</div>
                     <div className='list-right-txt'>
                       {item.controlStartDt
@@ -85,7 +81,7 @@ const ControlReportList = props => {
                         : '-'}
                     </div>
                   </dt>
-                  <dt>
+                  <dt onClick={() => handlerDetail(item)}>
                     <div className='list-left-txt'>속도(고도)</div>
                     <div className='list-right-txt'>
                       {item.speed ? item.speed : '-'}{' '}
@@ -94,12 +90,23 @@ const ControlReportList = props => {
                       {item.elev ? item.elevType : ''})
                     </div>
                   </dt>
-                  <dt>
+                  <dt onClick={() => handlerDetail(item)}>
                     <div className='list-left-txt'>상태</div>
                     <div className='list-right-txt'>
                       {item.dronStatus ? item.dronStatus : '-'}
                     </div>
                   </dt>
+                  <dt>
+                    <div className='data-list'>
+                      <a
+                        href='http://palnet.co.kr/'
+                        target='_blank'
+                        style={{ width: '100%' }}
+                      >
+                        <span>실시간 영상보기</span>
+                      </a>
+                    </div>
+                  </dt>
                 </dl>
               </div>
             );