From a19558c8380dedb9d7f792453eadc344cc4757b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?sanguu=28=EB=B0=95=EC=83=81=ED=98=84=29?= Date: Mon, 7 Nov 2022 17:51:01 +0900 Subject: [PATCH] =?UTF-8?q?=EB=82=A0=EC=94=A8=20=EB=A8=B8=EC=A7=80=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 --- .../control/report/ControlReportDetail.js | 472 +++++++++--------- 1 file changed, 233 insertions(+), 239 deletions(-) diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js index 5c5b659..d838706 100644 --- a/src/views/control/report/ControlReportDetail.js +++ b/src/views/control/report/ControlReportDetail.js @@ -12,12 +12,6 @@ import { GET_WGHT_TYPE_CD } from '../../../utility/CondeUtil'; import { controlGpLogAction, controlweatherAction } from '../../../modules/control/gp'; -======= -import dfsxyconv from '../../../utility/dfsxyconv'; -import { - controlGpLogAction, - controlweatherAction -} from '../../../modules/control/gp'; import ControlAlarmDetail from '../alarm/ControlAlarmDetail'; import axios from '../../../modules/utils/customAxiosUtil'; import { @@ -43,105 +37,105 @@ const ControlReportDetail = props => { function weathericon() { - 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 })); + 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 ; } } - }, [historyModal]); - const handlerClose = () => { - dispatch(objectUnClickAction()); - }; - - const nullMessage = val => { - if (val) { - return val; - } else { - return '-'; - } - }; - return ( -
-
-
-

드론 상세정보

- -
+ useEffect(() => { + if (historyModal) { + if (controlGpDetail) { + dispatch(controlGpLogAction.request({ id: controlGpDetail.controlId })); + } + } + }, [historyModal]); -
- -
+ const handlerClose = () => { + dispatch(objectUnClickAction()); + }; -
-
- - {controlDetail?.arcrftModelNm - ? controlDetail?.arcrftModelNm - : controlGpDetail?.objectId} + const nullMessage = val => { + if (val) { + return val; + } else { + return '-'; + } + }; + return ( +
+
+
+

드론 상세정보

+
-
- {controlDetail?.imageUrl ? ( - - ) : ( - - )} + +
+
-
-
-
-
제작번호
-
- {nullMessage(controlDetail?.prdctNum)} -
-
-
-
식별번호
-
- {controlGpDetail?.objectId} -
-
-
-
중량
-
- {GET_WGHT_TYPE_CD(controlDetail?.wghtTypeCd)} -
-
-
-
종류
-
- {GET_ARCTFT_TYPE_CD(controlDetail?.arcrftTypeCd)} -
-
- {/*
+ +
+
+ + {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)} +
+
+ {/*
배터리 잔량
{controlGpDetail?.betteryLevel} % @@ -153,179 +147,179 @@ const ControlReportDetail = props => { {controlGpDetail?.betteryVoltage} volt
*/} -
+
+
-
-
-
-

비행정보

-
-
-
-
-
-
시작위치
-
- {nullMessage(controlDetail?.stAreaNm)} -
-
-
-
시작시간
-
- {controlDetail?.cntrlStDt - ? moment(controlDetail?.cntrlStDt, 'YYYYMMDDHHmmss').format( +
+
+

비행정보

+
+
+
+
+
+
시작위치
+
+ {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 + ? 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?.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?.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
+
- -
- ); -}; - -export default ControlReportDetail; + ); + }; +} +export default ControlReportDetail; \ No newline at end of file