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

.env.development

@@ -1,3 +1,3 @@
-REACT_APP_HOST = http://localhost:8080/
+REACT_APP_HOST = http://192.168.0.24:8080/
-REACT_APP_WS_HOST = ws://localhost:8081/ws
+REACT_APP_WS_HOST = ws://192.168.0.24:8081/ws
 REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/

src/assets/css/custom.css

@@ -737,4 +737,9 @@ background-size: 75% auto;
 
 .m_ft{display:flex;align-items:flex-end;    justify-content: space-between;}
 .m_ft_box{flex:0 0 49%}
-.m_ft_box + .m_ft_box{margin-left:1%}
+.m_ft_box + .m_ft_box{margin-left:1%}
+
+.layer-content-box .history-btn{border-radius:4px;display:block;width:100%;height:45px;line-height:45px;text-align:center;font-size: 0.875rem;color:#ddd;font-weight:500;}
+.layer-content-box .history-btn:hover{border-radius:4px;background:#00cfe8;border-color:#00cfe8;transition: 0.3s ease;-webkit-transition: 0.3s ease;}
+.historyModal .drone-ti span{font-weight:500;margin-top:6px}
+.historyModal .drone-name{color:#00cfe8;margin:0 10px 0 0;}

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

@@ -36,8 +36,7 @@ export const DronMarker = props => {
 
         if (controlGpList) {
             controlGpList.forEach(gps => {
-                if (!gps.controlWarnCd) {
+                if (gps.controlWarnCd && gps.controlWarnNotyCd) {                    
-                    // gps marker가 지도상에 표출된 이후 시점부터 toast 표출
                     const marker = arrMarkers.find(marker => marker.id === gps.objectId);                
 
                     if(marker) {
@@ -47,7 +46,7 @@ export const DronMarker = props => {
                                 message={'경로 상에 비행 구역을 이탈했습니다.'}
                             />,
                             {
-                                autoClose: 3000, 
+                                // autoClose: 3000, 
                                 hideProgressBar: true,
                                 position: toast.POSITION.BOTTOM_RIGHT,
                                 onClick: props => {                         

src/modules/control/gp/models/controlGpModel.ts

@@ -89,6 +89,7 @@ export interface ControlGpData {
   controlStartDt: string;
   heading: number;
   controlWarnCd: boolean;
+  controlWarnNotyCd: boolean;
 }
 
 export interface ControlGroupAuthData {

src/views/control/alarm/ControlAlarmNotice.js

@@ -2,7 +2,7 @@ import { Bell, ChevronDown, ChevronUp } from "react-feather";
 import { ReactComponent as DroneMenuIcon } from '../../../assets/images/drone_menu_icon.svg';
 
 const ControlAlarmNotice = () => {
-  {/* 알림 위아래 롤링은 구현해주셔야되는데 따른 컴포넌트있으면 그거사용해도됩니다...제가 만들어논거는 45px씩 움직여주면되거든요..저도자세히는모르겠습니다...제이쿼리로만써봐서... */}
+  {}
     return(
         
       <div>

src/views/control/main/ControlMain.js

@@ -76,6 +76,11 @@ const ControlMain = () => {
               <DroneMenuIcon width='30' height='30' />
             </button>
           </li>
+          <li>
+            <button>
+              <Bell width='20' height='20' />
+            </button>
+          </li>
           {/* <li>
             <button onClick={() => openMenu('weatherList')}>
               <Sun size={25} />

src/views/control/report/ControlReportDetail.js

@@ -1,5 +1,6 @@
 import moment from 'moment';
 import React from 'react';
+import { useState, useEffect } from 'react';
 import { X } from 'react-feather';
 import { useDispatch, useSelector } from 'react-redux';
 import drone_img from '../../../assets/images/drone.jpg';
@@ -10,8 +11,10 @@ import {
   GET_ARCTFT_TYPE_CD,
   GET_WGHT_TYPE_CD
 } from '../../../utility/CondeUtil';
+import { Button, Modal, ModalHeader, ModalBody, ModalFooter  } from 'reactstrap'
 
 const ControlReportDetail = props => {
+  const [historyModal, setHistoryModal] = useState(false);
   const dispatch = useDispatch();
 
   const { controlGpDetail, controlDetail } = useSelector(
@@ -34,7 +37,6 @@ const ControlReportDetail = props => {
       return '-';
     }
   };
-
   return (
     <div className='left-layer'>
       <div className='layer-content'>
@@ -49,6 +51,47 @@ const ControlReportDetail = props => {
             <X size={20} />
           </button>
         </div>
+        
+        <div className='layer-content-box mb-1'>
+            <button type="button" className='history-btn'onClick={() => setHistoryModal(!historyModal)}>비정상상황 알림내역</button> 
+        </div>
+        <Modal
+          isOpen={historyModal}
+          toggle={() => setHistoryModal(!historyModal)}
+          className='modal-dialog-centered historyModal'
+        >
+          <ModalHeader toggle={() => setHistoryModal(!historyModal)}>
+          <div className='drone-ti'>
+            <span className="drone-name">DRONE01</span>
+            <span>알림내역</span>
+          </div>
+        
+          </ModalHeader>
+          <ModalBody>
+            <table className='table pal-table'>
+              <tr>
+                <th>번호</th>
+                <th>날짜</th>
+                <th>내용</th>
+              </tr>
+              <tr>
+                <th>1</th>
+                <th>2022-08-12 22:12:05</th>
+                <th>탈출!!비상탈출!!!</th>
+              </tr>
+            </table>
+          </ModalBody>
+          <ModalFooter>
+            <Button
+              color='info'
+              onClick={() => setHistoryModal(!historyModal)}
+            >
+              확인
+            </Button>
+          </ModalFooter>
+        </Modal>
+
+
         <div className='layer-content-box'>
           <div className='drone-ti'>
             <img src={drone_yellow} width='40' />