From 1d62ca0aff8aa215891b19a8424dcab9a730ce17 Mon Sep 17 00:00:00 2001
From: sanguu516 <sanguu516@naver.com>
Date: Mon, 22 Jul 2024 11:21:48 +0900
Subject: [PATCH] =?UTF-8?q?feat/modal=20=EC=A7=80=EC=97=AD=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flight/NewFlightApprovalsReport.js        |  6 ++++-
 .../flight/OperationApprovalsTable.js         |  4 ----
 src/containers/controlRightMenuContainer.js   | 22 +++++++++++++----
 .../flight/ControlApprovalsContainer.js       | 21 +++-------------
 .../flight/OperationApprovalsContainer.js     | 24 +++----------------
 src/containers/rightMenuContainer.js          | 23 +++++++++++++-----
 6 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/src/components/flight/NewFlightApprovalsReport.js b/src/components/flight/NewFlightApprovalsReport.js
index f3ccdb67..f16dfa2c 100644
--- a/src/components/flight/NewFlightApprovalsReport.js
+++ b/src/components/flight/NewFlightApprovalsReport.js
@@ -16,7 +16,11 @@ export default function NewFlightApprovalsReport(props) {
     const popupSyncSearchData = JSON.parse(localStorage.getItem('popupState'));
 
     if (popupSyncSearchData) {
-      props.setFilterArea(popupSyncSearchData.selected);
+      props.setFilterArea({
+        ctprvn: popupSyncSearchData.ctprvn,
+        sig: popupSyncSearchData.sig,
+        address: popupSyncSearchData.address
+      });
       props.setFilterId(popupSyncSearchData.filter);
       setSearchDate({
         startDate: popupSyncSearchData.startDate,
diff --git a/src/components/flight/OperationApprovalsTable.js b/src/components/flight/OperationApprovalsTable.js
index 4fc43292..a8d0bdd6 100644
--- a/src/components/flight/OperationApprovalsTable.js
+++ b/src/components/flight/OperationApprovalsTable.js
@@ -1018,7 +1018,6 @@ export default function OperationApprovalsTable(props) {
   // 확장된 테이블 행 클릭 이벤트
   const handleInRowClick = async row => {
     handlerOpenModal(row.approvalCd, row.fltElev, row.fltElevMax);
-
     if (props.selectedPlanSno !== row.planSno) {
       // 지도에 표출되지 않은 확장 테이블 행 클릭
       const areaList = expandedRowDatas.filter(
@@ -1138,9 +1137,6 @@ export default function OperationApprovalsTable(props) {
           </span>
         </div>
         <div className='download'>
-          <Button color='primary' size='sm'>
-            검토 완료
-          </Button>
           <Button
             color='primary'
             size='sm'
diff --git a/src/containers/controlRightMenuContainer.js b/src/containers/controlRightMenuContainer.js
index ac4027f6..5edbc2c9 100644
--- a/src/containers/controlRightMenuContainer.js
+++ b/src/containers/controlRightMenuContainer.js
@@ -14,7 +14,11 @@ function ControlRightMenuContainer() {
   const [filterId, setFilterId] = useState('');
 
   // 지역
-  const [filterArea, setFilterArea] = useState('');
+  const [filterArea, setFilterArea] = useState({
+    ctprvn: '전체',
+    sig: '전체',
+    address: ''
+  });
 
   const dispatch = useDispatch();
 
@@ -79,7 +83,9 @@ function ControlRightMenuContainer() {
         getLaancAprvList({
           searchStDt: searchDate.startDate,
           searchEndDt: searchDate.endDate,
-          selectZone: filterArea,
+          ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn,
+          sig: filterArea.sig === '전체' ? '' : filterArea.sig,
+          address: filterArea.address,
           approvalCd: search === '승인' ? 'S' : search === '미승인' ? 'F' : 'U'
         })
       );
@@ -88,7 +94,9 @@ function ControlRightMenuContainer() {
         getLaancAprvList({
           searchStDt: searchDate.startDate,
           searchEndDt: searchDate.endDate,
-          selectZone: filterArea,
+          ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn,
+          sig: filterArea.sig === '전체' ? '' : filterArea.sig,
+          address: filterArea.address,
           applyNo: search
         })
       );
@@ -97,7 +105,9 @@ function ControlRightMenuContainer() {
         getLaancAprvList({
           searchStDt: searchDate.startDate,
           searchEndDt: searchDate.endDate,
-          selectZone: filterArea
+          ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn,
+          sig: filterArea.sig === '전체' ? '' : filterArea.sig,
+          address: filterArea.address
         })
       );
     }
@@ -105,7 +115,9 @@ function ControlRightMenuContainer() {
       'popupState',
       JSON.stringify({
         filter: search,
-        selected: filterArea,
+        ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn,
+        sig: filterArea.sig === '전체' ? '' : filterArea.sig,
+        address: filterArea.address,
         startDate: searchDate.startDate,
         endDate: searchDate.endDate
       })
diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js
index 6a4096a7..2b2ffed9 100644
--- a/src/containers/flight/ControlApprovalsContainer.js
+++ b/src/containers/flight/ControlApprovalsContainer.js
@@ -23,22 +23,8 @@ import { setLogout } from '@src/redux/features/account/auth/authThunk';
 import logo from '../../assets/images/logo/kac_logo_ icon.svg';
 import { AiOutlinePoweroff } from 'react-icons/ai';
 import WebsocketClient from '../../components/websocket/WebsocketClient';
-import {
-  Card,
-  ButtonGroup,
-  Button,
-  Modal,
-  ModalHeader,
-  ModalBody,
-  ModalFooter,
-  Table
-} from '@component/ui';
-import {
-  FiUsers,
-  FiFileText,
-  FiRotateCw,
-  FiCornerUpLeft
-} from 'react-icons/fi';
+import { Card, ButtonGroup, Button } from '@component/ui';
+import { FiRotateCw, FiCornerUpLeft } from 'react-icons/fi';
 import { X } from 'react-feather';
 import mapboxgl from 'mapbox-gl';
 
@@ -70,7 +56,6 @@ export default function ControlApprovalsContainer({ mode }) {
     address: ''
   });
 
-  console.log('>>>', filterArea);
   const { map, mapType } = useSelector(state => state.mapState);
 
   // popup
@@ -445,7 +430,7 @@ export default function ControlApprovalsContainer({ mode }) {
               <div className='data-box-btn-list'>
                 <h4>측정</h4>
                 <div className='distance-check'>
-                  <div class='btn-box'>
+                  <div className='btn-box'>
                     <Button
                       className='btn-icon rounded-circle'
                       color='primary'
diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js
index a133357c..7e41af1b 100644
--- a/src/containers/flight/OperationApprovalsContainer.js
+++ b/src/containers/flight/OperationApprovalsContainer.js
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState, lazy, Suspense } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useDispatch, useSelector } from '@src/redux/store';
 import NewFlightApprovalsReport from '../../components/flight/NewFlightApprovalsReport';
 import {
@@ -29,22 +29,8 @@ import { setLogout } from '@src/redux/features/account/auth/authThunk';
 import logo from '../../assets/images/logo/kac_logo_ icon.svg';
 import { AiOutlinePoweroff } from 'react-icons/ai';
 import WebsocketClient from '../../components/websocket/WebsocketClient';
-import {
-  Card,
-  ButtonGroup,
-  Button,
-  Modal,
-  ModalHeader,
-  ModalBody,
-  ModalFooter,
-  Table
-} from '@component/ui';
-import {
-  FiUsers,
-  FiFileText,
-  FiRotateCw,
-  FiCornerUpLeft
-} from 'react-icons/fi';
+import { Card, ButtonGroup, Button } from '@component/ui';
+import { FiRotateCw, FiCornerUpLeft } from 'react-icons/fi';
 import { X } from 'react-feather';
 
 import mapboxgl from 'mapbox-gl';
@@ -91,7 +77,6 @@ export default function OperationApprovalsContainer({ mode }) {
   const popupRef = useRef(null);
   const rightMenuRef = useRef(null);
   const savedRightMenuRef = useRef(null);
-  const [clientX, setClientX] = useState(0);
 
   // 비행구역 데이터블록
   const [dataBlocks, setDataBlocks] = useState([]);
@@ -164,7 +149,6 @@ export default function OperationApprovalsContainer({ mode }) {
                 endDate
               }
             });
-
             return;
           case 'search':
             const { search, searchDate, filterArea } = payload;
@@ -608,8 +592,6 @@ export default function OperationApprovalsContainer({ mode }) {
     }
   };
 
-  const [testModal, setTestModal] = useState(false);
-
   return (
     <>
       <div className='map' style={{ width: '100%' }}>
diff --git a/src/containers/rightMenuContainer.js b/src/containers/rightMenuContainer.js
index 460843af..a7e32c04 100644
--- a/src/containers/rightMenuContainer.js
+++ b/src/containers/rightMenuContainer.js
@@ -16,8 +16,11 @@ function RightMenuContainer() {
   const [filterId, setFilterId] = useState('');
 
   // 지역
-  const [filterArea, setFilterArea] = useState('');
-
+  const [filterArea, setFilterArea] = useState({
+    ctprvn: '전체',
+    sig: '전체',
+    address: ''
+  });
   const dispatch = useDispatch();
 
   useEffect(() => {
@@ -82,7 +85,9 @@ function RightMenuContainer() {
         getLaancAprvList({
           searchStDt: searchDate.startDate,
           searchEndDt: searchDate.endDate,
-          selectZone: filterArea,
+          ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn,
+          sig: filterArea.sig === '전체' ? '' : filterArea.sig,
+          address: filterArea.address,
           approvalCd: search === '승인' ? 'S' : search === '미승인' ? 'F' : 'U'
         })
       );
@@ -91,7 +96,9 @@ function RightMenuContainer() {
         getLaancAprvList({
           searchStDt: searchDate.startDate,
           searchEndDt: searchDate.endDate,
-          selectZone: filterArea,
+          ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn,
+          sig: filterArea.sig === '전체' ? '' : filterArea.sig,
+          address: filterArea.address,
           applyNo: search
         })
       );
@@ -100,7 +107,9 @@ function RightMenuContainer() {
         getLaancAprvList({
           searchStDt: searchDate.startDate,
           searchEndDt: searchDate.endDate,
-          selectZone: filterArea
+          ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn,
+          sig: filterArea.sig === '전체' ? '' : filterArea.sig,
+          address: filterArea.address
         })
       );
     }
@@ -108,7 +117,9 @@ function RightMenuContainer() {
       'popupState',
       JSON.stringify({
         filter: search,
-        selected: filterArea,
+        ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn,
+        sig: filterArea.sig === '전체' ? '' : filterArea.sig,
+        address: filterArea.address,
         startDate: searchDate.startDate,
         endDate: searchDate.endDate
       })