From 41adf945456203ee377685ecf7c32bb675c3b3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?sanguu516=28=EB=B0=95=EC=83=81=ED=98=84=29?= Date: Mon, 18 Sep 2023 09:38:41 +0900 Subject: [PATCH] =?UTF-8?q?LAANC=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/map/reducers/controlMapReducer.ts | 4 +- src/views/control/main/ControlMain.js | 164 ++++++++++++------ 2 files changed, 113 insertions(+), 55 deletions(-) diff --git a/src/modules/control/map/reducers/controlMapReducer.ts b/src/modules/control/map/reducers/controlMapReducer.ts index 49afabe..cbefdd2 100644 --- a/src/modules/control/map/reducers/controlMapReducer.ts +++ b/src/modules/control/map/reducers/controlMapReducer.ts @@ -11,11 +11,9 @@ const initialState = { area0005: true, // 이착륙장(RC비행장) area0006: true, // 초경량비행장치 sensor: 'dust', - + isLaanc: false, drawType: null, - ctrlDrawType: null, - drawCheck: '' }; diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js index eea6ba4..56f0b6a 100644 --- a/src/views/control/main/ControlMain.js +++ b/src/views/control/main/ControlMain.js @@ -43,7 +43,11 @@ import { NavLink } from 'reactstrap'; const ControlMain = () => { const dispatch = useDispatch(); - const { isClickObject } = useSelector(state => state.controlMapReducer); + const { isClickObject, isLaanc } = useSelector( + state => state.controlMapReducer + ); + const mapControl = useSelector(state => state.controlMapReducer); + const { controlGpList, controlGroupAuthInfo } = useSelector( state => state.controlGpState ); @@ -53,6 +57,7 @@ const ControlMain = () => { const { controlGpCountDrone, controlGpCountFlight } = useSelector( state => state.controlGpCountState ); + console.log('>>>>', isClickObject); // pav박람회 -> uam, 드론 구별을 위한 임시 코드 // (이 작업으로 고도화 하려면 추후에 서버에서 uam타입을 새로 더 받아 작업해야 함) @@ -171,49 +176,106 @@ const ControlMain = () => { } }; + const hadlerLaanc = () => { + if (isLaanc) mapControl.isLaanc = false; + else if (!isLaanc) mapControl.isLaanc = true; + }; return ( <> - + {isLaanc ? ( + <> + {' '} + +
+

+ + PAL +

-
-

- - PAL -

+
    +
  • + +
  • + {/*
  • + +
  • */} + {/*
  • + +
  • */} +
  • + +
  • +
  • + + + +
  • +
+
    + {/*
  • + +
  • +
  • + +
  • +
  • + +
  • */} +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • + {/* socket_off = 클래스명 변경시 빨간색! 접속이 원할하지않을때 */} +
+
+ + ) : ( + <> + +
+

+ + PAL +

-
    -
  • - -
  • - {/*
  • +
      + {/*
    • */} - {/*
    • + {/*
    • */} -
    • - -
    • -
    • - - - -
    • -
    -
      - {/*
    • +
    +
      + {/*
    • @@ -222,25 +284,23 @@ const ControlMain = () => {
    • */} -
    • - -
    • -
    • - -
    • -
    • - -
    • -
    • - -
    • - {/* socket_off = 클래스명 변경시 빨간색! 접속이 원할하지않을때 */} -
    -
+ +
  • + +
  • +
  • + +
  • + {/* socket_off = 클래스명 변경시 빨간색! 접속이 원할하지않을때 */} + +
    + + )} +
    {
    - {}}>승인요청 바로가기 + 승인요청 바로가기
    {/*
    handlerDrawType('RESET')}>초기화