From f66335f6e52862807471fcf08fbef3e532899f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Fri, 12 Aug 2022 10:58:21 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=20=EC=83=81?= =?UTF-8?q?=ED=99=A9=20=EC=95=8C=EB=A6=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/map/naver/dron/DronMarker.js | 5 ++--- src/modules/control/gp/models/controlGpModel.ts | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index 3bd155c..bcf406c 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -30,8 +30,7 @@ export const DronMarker = props => { if (controlGpList) { controlGpList.forEach(gps => { - if (!gps.controlWarnCd) { - // gps marker가 지도상에 표출된 이후 시점부터 toast 표출 + if (gps.controlWarnCd && gps.controlWarnNotyCd) { const marker = arrMarkers.find(marker => marker.id === gps.objectId); if(marker) { @@ -41,7 +40,7 @@ export const DronMarker = props => { message={'경로 상에 비행 구역을 이탈했습니다.'} />, { - autoClose: 3000, + // autoClose: 3000, hideProgressBar: true, position: toast.POSITION.BOTTOM_RIGHT, onClick: props => { diff --git a/src/modules/control/gp/models/controlGpModel.ts b/src/modules/control/gp/models/controlGpModel.ts index d07262e..2707796 100644 --- a/src/modules/control/gp/models/controlGpModel.ts +++ b/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 { From 97d19baa42e7c2d805c87556fa401210295dc1d8 Mon Sep 17 00:00:00 2001 From: geun <1416geun@naver.com> Date: Fri, 12 Aug 2022 13:21:53 +0900 Subject: [PATCH 2/6] . --- .env.development | 4 ++-- src/views/control/main/ControlMain.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 69e358d..658b376 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ -REACT_APP_HOST = http://localhost:8080/ -REACT_APP_WS_HOST = ws://localhost:8081/ws +REACT_APP_HOST = http://192.168.0.24:8080/ +REACT_APP_WS_HOST = ws://192.168.0.24:8081/ws REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/ diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js index c7ec670..0cab7bb 100644 --- a/src/views/control/main/ControlMain.js +++ b/src/views/control/main/ControlMain.js @@ -76,6 +76,11 @@ const ControlMain = () => { +
  • + +
    • {/*
  • + +
    + +
    +
    From 4f61d66ff898173a8c88e53eb1ddaa0147b1936a Mon Sep 17 00:00:00 2001 From: geun <1416geun@naver.com> Date: Fri, 12 Aug 2022 15:00:46 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=EC=83=81?= =?UTF-8?q?=ED=99=A9=20=EC=95=8C=EB=A6=BC=EB=82=B4=EC=97=AD=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/report/ControlReportDetail.js | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js index db8c9b5..d6dd0ca 100644 --- a/src/views/control/report/ControlReportDetail.js +++ b/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 (
    @@ -51,9 +53,41 @@ const ControlReportDetail = props => {
    - +
    - + setHistoryModal(!historyModal)} + className='modal-dialog-centered' + > + setHistoryModal(!historyModal)}> + (기체명) 비정상상황 알림내역 + + + + + + + + + + + + + +
    번호날짜내용
    12022-08-12 22:12:05탈출!!비상탈출!!!
    +     + + + +     + +
    From aa577d54af1f9ad8e924ed5f08fae0b18b9361f5 Mon Sep 17 00:00:00 2001 From: geun <1416geun@naver.com> Date: Fri, 12 Aug 2022 15:14:31 +0900 Subject: [PATCH 6/6] . --- src/assets/css/custom.css | 6 ++++-- src/views/control/report/ControlReportDetail.js | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css index 4b60ea6..523b597 100644 --- a/src/assets/css/custom.css +++ b/src/assets/css/custom.css @@ -739,5 +739,7 @@ background-size: 75% auto; .m_ft_box{flex:0 0 49%} .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:400;} -.layer-content-box .history-btn:hover{border-radius:4px;background:#7367f0;border-color:#7367f0;transition: 0.3s ease;-webkit-transition: 0.3s ease;} \ No newline at end of file +.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;} \ No newline at end of file diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js index d6dd0ca..d3f0425 100644 --- a/src/views/control/report/ControlReportDetail.js +++ b/src/views/control/report/ControlReportDetail.js @@ -58,10 +58,14 @@ const ControlReportDetail = props => { setHistoryModal(!historyModal)} - className='modal-dialog-centered' + className='modal-dialog-centered historyModal' > setHistoryModal(!historyModal)}> - (기체명) 비정상상황 알림내역 +
    + DRONE01 + 알림내역 +
    +     @@ -79,7 +83,7 @@ const ControlReportDetail = props => {