From 7392a768544c7bb6ab7454225caff63b127c8be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kimjh=28=EA=B9=80=EC=9E=A5=ED=98=84=29?=
 <kimjh2369@gmail.com>
Date: Fri, 4 Nov 2022 18:13:57 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=9C=EB=A1=A0=20=EA=B4=80=EC=A0=9C=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=A0=95=EB=B3=B4=20=EC=9D=B4=EC=8A=88=20?=
 =?UTF-8?q?=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     | 72 ++++++++++++-------
 src/views/control/report/ControlReportList.js | 10 +--
 2 files changed, 51 insertions(+), 31 deletions(-)

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 <CloudSnow />;
       } else if (skyDetail == 0 || wheatherDetail[5].fcstValue == 1) {
         return <Sun />;
-      } else
-        return <Cloud />;
+      } else return <Cloud />;
     }
   }
   // 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 => {
               <dt>
                 <div className='list-left-txt'>시작시간</div>
                 <div className='list-right-txt'>
-                  {moment(
-                    controlDetail?.cntrlStDt,
-                    'YYYYMMDDHHmmss'
-                  ).format('MM-DD HH:mm:ss')}
+                  {controlDetail?.cntrlStDt
+                    ? moment(controlDetail?.cntrlStDt, 'YYYYMMDDHHmmss').format(
+                        'MM-DD HH:mm:ss'
+                      )
+                    : '-'}
                 </div>
               </dt>
               {/* <dt>
@@ -253,19 +254,25 @@ const ControlReportDetail = props => {
               <dt>
                 <div className='list-left-txt'>속도</div>
                 <div className='list-right-txt'>
-                  {controlGpDetail?.speed} {controlGpDetail?.speedType}
+                  {controlGpDetail?.speed && controlGpDetail?.speedType
+                    ? `${controlGpDetail?.speed} ${controlGpDetail?.speedType}`
+                    : '-'}
                 </div>
               </dt>
               <dt>
                 <div className='list-left-txt'>고도</div>
                 <div className='list-right-txt'>
-                  {controlGpDetail?.elev} {controlGpDetail?.elevType}
+                  {controlGpDetail?.elev && controlGpDetail?.elevType
+                    ? `${controlGpDetail?.elev} ${controlGpDetail?.elevType}`
+                    : '-'}
                 </div>
               </dt>
               <dt>
                 <div className='list-left-txt'>좌표(위도/경도)</div>
                 <div className='list-right-txt'>
-                  {controlGpDetail?.lat} / {controlGpDetail?.lng}
+                  {controlGpDetail?.lat && controlGpDetail?.lng
+                    ? `${controlGpDetail?.lat} / ${controlGpDetail?.lng}`
+                    : '-'}
                 </div>
               </dt>
               {/* <dt>
@@ -278,7 +285,7 @@ const ControlReportDetail = props => {
               <dt>
                 <div className='list-left-txt'>헤딩 방위각</div>
                 <div className='list-right-txt'>
-                  {controlGpDetail?.heading}
+                  {nullMessage(controlGpDetail?.heading)}
                 </div>
               </dt>
               {/* <dt>
@@ -290,11 +297,12 @@ const ControlReportDetail = props => {
               <dt>
                 <div className='list-left-txt'>위치정보 수신 시간</div>
                 <div className='list-right-txt'>
-                  {' '}
-                  {moment(
-                    controlGpDetail?.serverRcvDt,
-                    'YYYYMMDDHHmmss'
-                  ).format('MM-DD HH:mm:ss')}
+                  {controlGpDetail?.serverRcvDt
+                    ? moment(
+                        controlGpDetail?.serverRcvDt,
+                        'YYYYMMDDHHmmss'
+                      ).format('MM-DD HH:mm:ss')
+                    : '-'}
                 </div>
               </dt>
             </dl>
@@ -315,7 +323,6 @@ const ControlReportDetail = props => {
               <dt>
                 <div className='list-left-txt'>담당자 이름</div>
                 <div className='list-right-txt'>
-                  {' '}
                   {nullMessage(controlDetail?.ownerNm)}
                 </div>
               </dt>
@@ -330,15 +337,18 @@ const ControlReportDetail = props => {
         </div>
       </div>
       <div className='layer-content'>
-        <div className="layer-ti">
+        <div className='layer-ti'>
           <h4>날씨 정보</h4>
         </div>
-        <div className="layer-content-box">
-          <div className="layer-content-info">
-            <div className="layer-weather-table">
-              <div className="layer-weather-address">
+        <div className='layer-content-box'>
+          <div className='layer-content-info'>
+            <div className='layer-weather-table'>
+              <div className='layer-weather-address'>
                 현재위치의 날씨 정보입니다.
-                <span><Compass size={20} />{controlDetail?.stAreaNm}</span>
+                <span>
+                  <Compass size={20} />
+                  {controlDetail?.stAreaNm}
+                </span>
               </div>
               <Table responsive>
                 <thead>
@@ -352,10 +362,18 @@ const ControlReportDetail = props => {
                 </thead>
                 <tbody>
                   <tr>
-                    <td>{controlDetail?.items.item[12].fcstTime.substring(0, 2)}시</td>
+                    <td>
+                      {controlDetail?.items.item[12].fcstTime.substring(0, 2)}시
+                    </td>
                     <td>{a()}</td>
                     <td>{controlDetail?.items.item[12].fcstValue}℃</td>
-                    <td><Navigation2 style={{ transform: `rotate(${controlDetail?.items.item[3].fcstValue}deg)` }} /></td>
+                    <td>
+                      <Navigation2
+                        style={{
+                          transform: `rotate(${controlDetail?.items.item[3].fcstValue}deg)`
+                        }}
+                      />
+                    </td>
                     <td>{controlDetail?.items.item[4].fcstValue}m/s</td>
                   </tr>
                 </tbody>
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 => {
                   <dt>
                     <div className='list-left-txt'>이륙 시간</div>
                     <div className='list-right-txt'>
-                      {moment(item.controlStartDt, 'YYYYMMDDHHmmss').format(
-                        'MM-DD HH:mm:ss'
-                      )}
+                      {item.controlStartDt
+                        ? moment(item.controlStartDt, 'YYYYMMDDHHmmss').format(
+                            'MM-DD HH:mm:ss'
+                          )
+                        : '-'}
                     </div>
                   </dt>
                   <dt>