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

.prettierignore

@@ -0,0 +1,2 @@
+custom.css
+reset.css

src/assets/css/custom.css

@@ -838,4 +838,6 @@ background-size: 75% auto;
 .data-list + .data-list{margin-left:10px;}
 .data-list span{font-size:0.8rem;color: #ddd;font-weight:400;}
 .data-list span + span{margin-left:4px;}
-.data-list .navigation-icon{width:16px;margin-top:-5px;margin-left:2px;}
+.data-list .navigation-icon{width:16px;margin-top:-5px;margin-left:2px;}
+
+.layer-weather-address{display:flex;align-items:center;justify-content:space-between;}

src/components/map/naver/dron/DronMarker.js

@@ -177,7 +177,7 @@ export const DronMarker = props => {
       const pal = controlGroupAuthInfo?.find(
         prev => prev.idntfNum === gps.objectId
       );
-      if (pal) {
+      if (pal || id.includs('NAMWON')) {
         markerOption.url = DronUamIcon;
         markerOption.type = 'DRONE';
         gpsCnt.type = 'drone';
@@ -588,7 +588,6 @@ export const DronMarker = props => {
       if (arrInfos.filter(i => i._controlId === marker.controlId).length > 0) {
         return;
       }
-      console.log(controlGpList[idx]);
       infoInit(marker, controlGpList[idx], idx);
 
       if (controlGpList.length != 0) {

src/views/control/report/ControlReportDetail.js

@@ -166,8 +166,8 @@ const ControlReportDetail = props => {
                 <div className='list-right-txt'>
                   {controlDetail?.cntrlStDt
                     ? moment(controlDetail?.cntrlStDt, 'YYYYMMDDHHmmss').format(
-                      'MM-DD HH:mm:ss'
+                        'MM-DD HH:mm:ss'
-                    )
+                      )
                     : '-'}
                 </div>
               </dt>
@@ -225,9 +225,9 @@ const ControlReportDetail = props => {
                 <div className='list-right-txt'>
                   {controlGpDetail?.serverRcvDt
                     ? moment(
-                      controlGpDetail?.serverRcvDt,
+                        controlGpDetail?.serverRcvDt,
-                      'YYYYMMDDHHmmss'
+                        'YYYYMMDDHHmmss'
-                    ).format('MM-DD HH:mm:ss')
+                      ).format('MM-DD HH:mm:ss')
                     : '-'}
                 </div>
               </dt>
@@ -271,7 +271,7 @@ const ControlReportDetail = props => {
             <div className='layer-weather-table'>
               <div className='layer-weather-address'>
                 현재위치의 날씨 정보입니다.
-                <span>
+                <span className='mt-0'>
                   <Compass size={20} />
                   {controlDetail?.stAreaNm}
                 </span>

src/views/control/report/ControlReportList.js

@@ -96,7 +96,24 @@ const ControlReportList = props => {
                       {item.dronStatus ? item.dronStatus : '-'}
                     </div>
                   </dt>
-                  <dt>
+
+                  {item.objectId.includes('NAMWON') ? (
+                    <dt>
+                      <div className='data-list'>
+                        <a
+                          href='http://palnet.co.kr/'
+                          target='_blank'
+                          style={{ width: '100%' }}
+                        >
+                          <span>실시간 영상보기</span>
+                        </a>
+                      </div>
+                    </dt>
+                  ) : (
+                    <></>
+                  )}
+
+                  {/* <dt>
                     <div className='data-list'>
                       <a
                         href='http://palnet.co.kr/'
@@ -106,7 +123,7 @@ const ControlReportList = props => {
                         <span>실시간 영상보기</span>
                       </a>
                     </div>
-                  </dt>
+                  </dt> */}
                 </dl>
               </div>
             );