diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js
index 81f0563..877e74f 100644
--- a/src/views/control/report/ControlReportDetail.js
+++ b/src/views/control/report/ControlReportDetail.js
@@ -12,7 +12,10 @@ import {
GET_WGHT_TYPE_CD
} from '../../../utility/CondeUtil';
import dfsxyconv from '../../../utility/dfsxyconv';
-import { controlGpLogAction, controlweatherAction } from '../../../modules/control/gp';
+import {
+ controlGpLogAction,
+ controlweatherAction
+} from '../../../modules/control/gp';
import ControlAlarmDetail from '../alarm/ControlAlarmDetail';
import axios from '../../../modules/utils/customAxiosUtil';
import {
@@ -36,7 +39,6 @@ const ControlReportDetail = props => {
//const { controlWheather } = useSelector(state => state.ControlGpWeatherState);
const { controlGpWarnLog } = useSelector(state => state.controlGpLogState);
-
function a() {
if (controlDetail) {
let wheatherDetail = controlDetail.items.item;
@@ -47,8 +49,7 @@ const ControlReportDetail = props => {
return ;
} else if (skyDetail == 0 || wheatherDetail[5].fcstValue == 1) {
return ;
- } else
- return ;
+ } else return ;
}
}
// console.log("time", time);
@@ -122,7 +123,6 @@ const ControlReportDetail = props => {
// }, [controlGpDetail])
useEffect(() => {
-
if (historyModal) {
if (controlGpDetail) {
dispatch(controlGpLogAction.request({ id: controlGpDetail.controlId }));
@@ -238,10 +238,11 @@ const ControlReportDetail = props => {
시작시간
- {moment(
- controlDetail?.cntrlStDt,
- 'YYYYMMDDHHmmss'
- ).format('MM-DD HH:mm:ss')}
+ {controlDetail?.cntrlStDt
+ ? moment(controlDetail?.cntrlStDt, 'YYYYMMDDHHmmss').format(
+ 'MM-DD HH:mm:ss'
+ )
+ : '-'}
{/*
@@ -253,19 +254,25 @@ const ControlReportDetail = props => {
속도
- {controlGpDetail?.speed} {controlGpDetail?.speedType}
+ {controlGpDetail?.speed && controlGpDetail?.speedType
+ ? `${controlGpDetail?.speed} ${controlGpDetail?.speedType}`
+ : '-'}
고도
- {controlGpDetail?.elev} {controlGpDetail?.elevType}
+ {controlGpDetail?.elev && controlGpDetail?.elevType
+ ? `${controlGpDetail?.elev} ${controlGpDetail?.elevType}`
+ : '-'}
좌표(위도/경도)
- {controlGpDetail?.lat} / {controlGpDetail?.lng}
+ {controlGpDetail?.lat && controlGpDetail?.lng
+ ? `${controlGpDetail?.lat} / ${controlGpDetail?.lng}`
+ : '-'}
{/*
@@ -278,7 +285,7 @@ const ControlReportDetail = props => {
헤딩 방위각
- {controlGpDetail?.heading}
+ {nullMessage(controlGpDetail?.heading)}
{/*
@@ -290,11 +297,12 @@ const ControlReportDetail = props => {
위치정보 수신 시간
- {' '}
- {moment(
- controlGpDetail?.serverRcvDt,
- 'YYYYMMDDHHmmss'
- ).format('MM-DD HH:mm:ss')}
+ {controlGpDetail?.serverRcvDt
+ ? moment(
+ controlGpDetail?.serverRcvDt,
+ 'YYYYMMDDHHmmss'
+ ).format('MM-DD HH:mm:ss')
+ : '-'}
@@ -315,7 +323,6 @@ const ControlReportDetail = props => {
담당자 이름
- {' '}
{nullMessage(controlDetail?.ownerNm)}
@@ -330,15 +337,18 @@ const ControlReportDetail = props => {
-
+
날씨 정보
-
-
-
-
+
+
+
+
현재위치의 날씨 정보입니다.
- {controlDetail?.stAreaNm}
+
+
+ {controlDetail?.stAreaNm}
+
@@ -352,10 +362,18 @@ const ControlReportDetail = props => {
- {controlDetail?.items.item[12].fcstTime.substring(0, 2)}시 |
+
+ {controlDetail?.items.item[12].fcstTime.substring(0, 2)}시
+ |
{a()} |
{controlDetail?.items.item[12].fcstValue}℃ |
- |
+
+
+ |
{controlDetail?.items.item[4].fcstValue}m/s |
diff --git a/src/views/control/report/ControlReportList.js b/src/views/control/report/ControlReportList.js
index 6c365f7..d485126 100644
--- a/src/views/control/report/ControlReportList.js
+++ b/src/views/control/report/ControlReportList.js
@@ -16,7 +16,7 @@ const ControlReportList = props => {
const dispatch = useDispatch();
const handlerDetail = (objectId, cntrlId) => {
- dispatch(objectClickAction(objectId));
+ dispatch(objectClickAction(cntrlId));
dispatch(controlGpDtlAction.request(cntrlId));
};
@@ -77,9 +77,11 @@ const ControlReportList = props => {
이륙 시간
- {moment(item.controlStartDt, 'YYYYMMDDHHmmss').format(
- 'MM-DD HH:mm:ss'
- )}
+ {item.controlStartDt
+ ? moment(item.controlStartDt, 'YYYYMMDDHHmmss').format(
+ 'MM-DD HH:mm:ss'
+ )
+ : '-'}