diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js
index 30e02573..1ec35e65 100644
--- a/src/containers/analysis/history/AnalysisHistoryContainer.js
+++ b/src/containers/analysis/history/AnalysisHistoryContainer.js
@@ -91,7 +91,7 @@ export const AnalysisHistoryContainer = props => {
// const param = params;
// param.groupId = groupId;
- console.log(groupId);
+
dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT({ groupId: groupId }));
// groupId sessionStorage에 보관 (1 브라우저 1 tab에만 유효)
diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js
index dfabca3b..921ee58d 100644
--- a/src/views/control/main/ControlMain.js
+++ b/src/views/control/main/ControlMain.js
@@ -31,8 +31,8 @@ const ControlMain = () => {
const [alarm, setAlarm] = useState(false);
const [oepnReportList, setOpenReportList] = useState(false);
- const [openReportDetail, setOpenReportDetail] = useState(false);
- const [openWeatherList, setOpenWeatherList] = useState(false);
+ // const [openReportDetail, setOpenReportDetail] = useState(false);
+ // const [openWeatherList, setOpenWeatherList] = useState(false);
const [openAlarmList, setOpenAlarmList] = useState(false);
@@ -41,29 +41,29 @@ const ControlMain = () => {
const openMenu = val => {
if (val === 'reportList') {
setOpenReportList(true);
- setOpenReportDetail(false);
- setOpenWeatherList(false);
+ // setOpenReportDetail(false);
+ // setOpenWeatherList(false);
setOpenAlarmList(false);
} else if (val === 'weatherList') {
setOpenReportList(false);
- setOpenReportDetail(false);
- setOpenWeatherList(true);
+ // setOpenReportDetail(false);
+ // setOpenWeatherList(true);
setOpenAlarmList(false);
} else if (val === 'alarmList') {
dispatch(objectUnClickAction());
setOpenReportList(false);
- setOpenReportDetail(false);
- setOpenWeatherList(false);
+ // setOpenReportDetail(false);
+ // setOpenWeatherList(false);
setOpenAlarmList(true);
setAlarm(false);
}
};
- const openReportDetailParam = val => {
- setOpenReportDetail(true);
- };
+ // const openReportDetailParam = val => {
+ // setOpenReportDetail(true);
+ // };
const handlerLogout = () => {
dispatch(Actions.logout.request());
@@ -81,6 +81,18 @@ const ControlMain = () => {
}
}, [controlGpList]);
+ useEffect(() => {
+ if (isClickObject) {
+ setOpenReportList(false);
+ setOpenAlarmList(false);
+ }
+ }, [isClickObject]);
+
+ const handlerClose = () => {
+ setOpenReportList(true);
+ dispatch(objectUnClickAction());
+ };
+
return (
<>