diff --git a/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js b/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js
index 6e9fb2f..673ebc8 100644
--- a/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js
+++ b/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js
@@ -163,6 +163,7 @@ const FlightPlanAreaDetailForm = ({
base_time: basetime,
nx: rs.x,
ny: rs.y,
+
}
dispatch(FlightweatherAction.request(apidata));
}
diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js
index d838706..d8b57a6 100644
--- a/src/views/control/report/ControlReportDetail.js
+++ b/src/views/control/report/ControlReportDetail.js
@@ -35,107 +35,106 @@ const ControlReportDetail = props => {
//const { controlWheather } = useSelector(state => state.ControlGpWeatherState);
const { controlGpWarnLog } = useSelector(state => state.controlGpLogState);
+
function weathericon() {
+ if (controlDetail) {
+ let wheatherDetail = controlDetail.items.item;
+ let skyDetail = wheatherDetail[6].fcstValue;
+ if (skyDetail == 1 || skyDetail == 2 || skyDetail == 4) {
+ return ;
+ } else if (skyDetail == 4) {
+ return ;
+ } else if (skyDetail == 0 || wheatherDetail[5].fcstValue == 1) {
+ return ;
+ } else return ;
+ }
+ }
- function a() {
- if (controlDetail) {
- let wheatherDetail = controlDetail.items.item;
- let skyDetail = wheatherDetail[6].fcstValue;
- if (skyDetail == 1 || skyDetail == 2 || skyDetail == 4) {
- return ;
- } else if (skyDetail == 4) {
- return ;
- } else if (skyDetail == 0 || wheatherDetail[5].fcstValue == 1) {
- return ;
- } else return ;
+ useEffect(() => {
+ if (historyModal) {
+ if (controlGpDetail) {
+ dispatch(controlGpLogAction.request({ id: controlGpDetail.controlId }));
}
}
+ }, [historyModal]);
- useEffect(() => {
- if (historyModal) {
- if (controlGpDetail) {
- dispatch(controlGpLogAction.request({ id: controlGpDetail.controlId }));
- }
- }
- }, [historyModal]);
+ const handlerClose = () => {
+ dispatch(objectUnClickAction());
+ };
- const handlerClose = () => {
- dispatch(objectUnClickAction());
- };
+ const nullMessage = val => {
+ if (val) {
+ return val;
+ } else {
+ return '-';
+ }
+ };
+ return (
+
+
+
+
드론 상세정보
+
+
- const nullMessage = val => {
- if (val) {
- return val;
- } else {
- return '-';
- }
- };
- return (
-
-
-
-
드론 상세정보
-
-
+
+
+
-
-
+
+
+
+ {controlDetail?.arcrftModelNm
+ ? controlDetail?.arcrftModelNm
+ : controlGpDetail?.objectId}
-
-
-
-
- {controlDetail?.arcrftModelNm
- ? controlDetail?.arcrftModelNm
- : controlGpDetail?.objectId}
-
-
- {controlDetail?.imageUrl ? (
-
- ) : (
-
- )}
-
-
-
- -
-
제작번호
-
- {nullMessage(controlDetail?.prdctNum)}
-
-
- -
-
식별번호
-
- {controlGpDetail?.objectId}
-
-
- -
-
중량
-
- {GET_WGHT_TYPE_CD(controlDetail?.wghtTypeCd)}
-
-
- -
-
종류
-
- {GET_ARCTFT_TYPE_CD(controlDetail?.arcrftTypeCd)}
-
-
- {/* -
+
+ {controlDetail?.imageUrl ? (
+
+ ) : (
+
+ )}
+
+
+
+ -
+
제작번호
+
+ {nullMessage(controlDetail?.prdctNum)}
+
+
+ -
+
식별번호
+
+ {controlGpDetail?.objectId}
+
+
+ -
+
중량
+
+ {GET_WGHT_TYPE_CD(controlDetail?.wghtTypeCd)}
+
+
+ -
+
종류
+
+ {GET_ARCTFT_TYPE_CD(controlDetail?.arcrftTypeCd)}
+
+
+ {/* -
배터리 잔량
{controlGpDetail?.betteryLevel} %
@@ -147,179 +146,179 @@ const ControlReportDetail = props => {
{controlGpDetail?.betteryVoltage} volt
*/}
-
-
+
-
-
-
비행정보
-
-
-
-
- -
-
시작위치
-
- {nullMessage(controlDetail?.stAreaNm)}
-
-
- -
-
시작시간
-
- {controlDetail?.cntrlStDt
- ? moment(controlDetail?.cntrlStDt, 'YYYYMMDDHHmmss').format(
- 'MM-DD HH:mm:ss'
- )
- : '-'}
-
-
- {/* -
+
+
+
+
비행정보
+
+
+
+
+ -
+
시작위치
+
+ {nullMessage(controlDetail?.stAreaNm)}
+
+
+ -
+
시작시간
+
+ {controlDetail?.cntrlStDt
+ ? moment(controlDetail?.cntrlStDt, 'YYYYMMDDHHmmss').format(
+ 'MM-DD HH:mm:ss'
+ )
+ : '-'}
+
+
+ {/* -
현재위치
인천광역시 부평구 안남로 272
*/}
- -
-
속도
-
- {controlGpDetail?.speed && controlGpDetail?.speedType
- ? `${controlGpDetail?.speed} ${controlGpDetail?.speedType}`
- : '-'}
-
-
- -
-
고도
-
- {controlGpDetail?.elev && controlGpDetail?.elevType
- ? `${controlGpDetail?.elev} ${controlGpDetail?.elevType}`
- : '-'}
-
-
- -
-
좌표(위도/경도)
-
- {controlGpDetail?.lat && controlGpDetail?.lng
- ? `${controlGpDetail?.lat} / ${controlGpDetail?.lng}`
- : '-'}
-
-
- {/* -
+
-
+
속도
+
+ {controlGpDetail?.speed && controlGpDetail?.speedType
+ ? `${controlGpDetail?.speed} ${controlGpDetail?.speedType}`
+ : '-'}
+
+
+ -
+
고도
+
+ {controlGpDetail?.elev && controlGpDetail?.elevType
+ ? `${controlGpDetail?.elev} ${controlGpDetail?.elevType}`
+ : '-'}
+
+
+ -
+
좌표(위도/경도)
+
+ {controlGpDetail?.lat && controlGpDetail?.lng
+ ? `${controlGpDetail?.lat} / ${controlGpDetail?.lng}`
+ : '-'}
+
+
+ {/* -
비행거리
{nullMessage(controlGpDetail?.moveDistance)}{' '}
{controlGpDetail?.moveDistanceType}
*/}
- -
-
헤딩 방위각
-
- {nullMessage(controlGpDetail?.heading)}
-
-
- {/* -
+
-
+
헤딩 방위각
+
+ {nullMessage(controlGpDetail?.heading)}
+
+
+ {/* -
상태
{nullMessage(controlGpDetail?.dronStatus)}
*/}
- -
-
위치정보 수신 시간
-
- {controlGpDetail?.serverRcvDt
- ? moment(
- controlGpDetail?.serverRcvDt,
- 'YYYYMMDDHHmmss'
- ).format('MM-DD HH:mm:ss')
- : '-'}
-
-
-
-
+
+ 위치정보 수신 시간
+
+ {controlGpDetail?.serverRcvDt
+ ? moment(
+ controlGpDetail?.serverRcvDt,
+ 'YYYYMMDDHHmmss'
+ ).format('MM-DD HH:mm:ss')
+ : '-'}
+
+
+
-
-
-
운영자 정보
-
-
-
+
+
+
운영자 정보
+
+
+
+
+ {/* -
소속기관
팔네트웍스
*/}
- -
-
담당자 이름
-
- {nullMessage(controlDetail?.ownerNm)}
-
-
- -
-
담당자 연락처
-
- {nullMessage(controlDetail?.hpno)}
-
-
-
-
+
+ 담당자 이름
+
+ {nullMessage(controlDetail?.ownerNm)}
+
+
+
+ 담당자 연락처
+
+ {nullMessage(controlDetail?.hpno)}
+
+
+
-
-
-
날씨 정보
-
-
-
-
-
- 현재위치의 날씨 정보입니다.
-
-
- {controlDetail?.stAreaNm}
-
-
-
-
-
- 시각 |
- 날씨 |
- 기온 |
- 풍향 |
- 풍속 |
-
-
-
-
- {controlDetail?.items.item[0].baseTime.substring(0, 2)}시 |
- {weathericon()} |
-
- {controlDetail?.items.item[12].fcstTime.substring(0, 2)}시
- |
- {a()} |
- {controlDetail?.items.item[12].fcstValue}℃ |
-
-
- |
- {controlDetail?.items.item[4].fcstValue}m/s |
-
-
-
+
+
+
+
날씨 정보
+
+
+
+
+
+ 현재위치의 날씨 정보입니다.
+
+
+ {controlDetail?.stAreaNm}
+
+
+
+
+ 시각 |
+ 날씨 |
+ 기온 |
+ 풍향 |
+ 풍속 |
+
+
+
+
+ {controlDetail?.items.item[0].baseTime.substring(0, 2)}시 |
+ {weathericon()} |
+
+ {controlDetail?.items.item[12].fcstTime.substring(0, 2)}시
+ |
+ {weathericon()} |
+ {controlDetail?.items.item[12].fcstValue}℃ |
+
+
+ |
+ {controlDetail?.items.item[4].fcstValue}m/s |
+
+
+
-
- );
- };
-}
+
+
+ );
+};
+
export default ControlReportDetail;
\ No newline at end of file