From 0bd71b70628781f567878fcc538b5d5655eed9fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?=
 <junheee@palnet.co.kr>
Date: Tue, 16 May 2023 11:56:46 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EB=82=A8=EC=9B=90=20=EB=93=9C=EB=A1=A0?=
 =?UTF-8?q?=EB=A7=88=EC=BB=A4=20=ED=91=9C=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/map/naver/dron/DronMarker.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js
index d5f628e..524f7b4 100644
--- a/src/components/map/naver/dron/DronMarker.js
+++ b/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) {

From 6e1c6a71d898badc2d3b359071da7767e700a1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?=
 <junheee@palnet.co.kr>
Date: Tue, 16 May 2023 11:57:10 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EB=82=A0=EC=94=A8=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EA=B9=A8=EC=A7=90=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierignore                                 |  2 ++
 src/assets/css/custom.css                       |  4 +++-
 src/views/control/report/ControlReportDetail.js | 12 ++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 .prettierignore

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..db6d7c0
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,2 @@
+custom.css
+reset.css
\ No newline at end of file
diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css
index 908dcec..23ba9f7 100644
--- a/src/assets/css/custom.css
+++ b/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;}
\ No newline at end of file
+.data-list .navigation-icon{width:16px;margin-top:-5px;margin-left:2px;}
+
+.layer-weather-address{display:flex;align-items:center;justify-content:space-between;}
\ No newline at end of file
diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js
index 45abb7a..ed2c602 100644
--- a/src/views/control/report/ControlReportDetail.js
+++ b/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,
-                      'YYYYMMDDHHmmss'
-                    ).format('MM-DD HH:mm:ss')
+                        controlGpDetail?.serverRcvDt,
+                        'YYYYMMDDHHmmss'
+                      ).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>

From a98eeb158fd476dc73f582f36e1789f740aa925e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?=
 <junheee@palnet.co.kr>
Date: Tue, 16 May 2023 11:57:31 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EB=82=A8=EC=9B=90=EB=93=9C=EB=A1=A0=20?=
 =?UTF-8?q?=EC=8B=A4=EC=8B=9C=EA=B0=84=20=EC=98=81=EC=83=81=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/control/report/ControlReportList.js | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/views/control/report/ControlReportList.js b/src/views/control/report/ControlReportList.js
index 4e7e6ae..a236c22 100644
--- a/src/views/control/report/ControlReportList.js
+++ b/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>
             );