@@ -82,7 +79,7 @@ const SensorZone = (props) => {
emtpyLayerRemove();
if (controlGpList) {
controlGpList.forEach(controlGp => {
- const {controlId, lat, lng, objectId} = controlGp;
+ const { controlId, lat, lng, objectId } = controlGp;
let color = undefined;
const sensorData = convtSensorData(controlGp);
if (sensorData) {
@@ -105,21 +102,23 @@ const SensorZone = (props) => {
addPolilineLayers(controlId, objectId, position, color);
}
- const circleLayer = circleLayers.find(layer => layer.controlId === controlId);
- if (circleLayer) moveCircleLayer(circleLayer, position, color, sensorData);
+ const circleLayer = circleLayers.find(
+ layer => layer.controlId === controlId
+ );
+ if (circleLayer)
+ moveCircleLayer(circleLayer, position, color, sensorData);
else addCircleLayer(controlId, objectId, position, color, sensorData);
});
}
- }
+ };
// 센서레이어 생성
const addSensorLayer = (position, id, controlId, color, sensorData) => {
addPolilineLayers(controlId, id, position, color);
addCircleLayer(controlId, id, position, color, sensorData);
- }
+ };
// Circle 레이어 생성
const addCircleLayer = (controlId, id, position, color, sensorData) => {
- // console.log({controlId, id, position, color, sensorData})
const circleLayer = new naver.maps.Circle({
title: id,
id: id,
@@ -134,7 +133,7 @@ const SensorZone = (props) => {
fillColor: color,
fillOpacity: 0.2,
sensorData: sensorData
- })
+ });
// Circle 이벤트 주입
naver.maps.Event.addListener(circleLayer, 'mouseover', function (e) {
const data = {};
@@ -145,133 +144,149 @@ const SensorZone = (props) => {
e.overlay.setOptions({
strokeWeight: 5,
fillOpacity: 0.5
- })
+ });
infowindowOpen(data);
});
naver.maps.Event.addListener(circleLayer, 'mouseout', function (e) {
e.overlay.setOptions({
strokeWeight: 2,
fillOpacity: 0.2
- })
+ });
// props.map.Event.revertStyle();
if (infoWindow) {
infoWindow.close();
}
});
- circleLayer.setMap(props.map)
- setCircleLayers(prev => ([...prev, circleLayer]));
+ circleLayer.setMap(props.map);
+ setCircleLayers(prev => [...prev, circleLayer]);
+ };
- }
-
const addPolilineLayers = (controlId, id, position, color) => {
// 지도에 적용 및 레이어 관리 추가
- // console.log('addPolilineLayers', controlId)
+
const polilineLayers = createCircleInGrid(position, id, controlId, color);
polilineLayers.forEach(layer => layer.setMap(props.map));
setPolilineGroupLayers(prev => ({
...prev,
[controlId]: polilineLayers
}));
- }
+ };
// 센서레이어 이동
const moveSensorLayer = (controlId, position, color) => {
- const circleLayer = circleLayers.find(layer => layer.controlId === controlId);
+ const circleLayer = circleLayers.find(
+ layer => layer.controlId === controlId
+ );
moveCircleLayer(circleLayer, position, color);
const polilineLayers = polilineGroupLayers[controlId];
movePolilineLayers(polilineLayers, position, color);
- }
+ };
const moveCircleLayer = (circleLayer, position, color, sensorData) => {
// const circleLayer = circleLayers.find(layer => layer.controlId === controlId);
if (circleLayer) {
circleLayer.sensorData = sensorData;
- circleLayer.setOptions({center: position, strokeColor: color, fillColor: color})
+ circleLayer.setOptions({
+ center: position,
+ strokeColor: color,
+ fillColor: color
+ });
}
- }
-
+ };
+
const movePolilineLayers = (polilineLayers, position, color) => {
- const {controlId, id, position: prevPosition} = polilineLayers[0];
+ const { controlId, id, position: prevPosition } = polilineLayers[0];
if (prevPosition.equals(position)) {
if (polilineLayers) {
- polilineLayers.forEach(layer => layer.setOptions({strokeColor: color}));
+ polilineLayers.forEach(layer =>
+ layer.setOptions({ strokeColor: color })
+ );
}
} else {
if (polilineLayers) {
polilineLayers.forEach(layer => layer.setMap(null));
}
- const newPolilineLayers = createCircleInGrid(position, id, controlId, color);
+ const newPolilineLayers = createCircleInGrid(
+ position,
+ id,
+ controlId,
+ color
+ );
newPolilineLayers.forEach(layer => layer.setMap(props.map));
setPolilineGroupLayers(prev => ({
...prev,
[controlId]: newPolilineLayers
}));
}
- }
+ };
// 센서레이어 제거
- const removeSensorLayer = (controlId) => {
+ const removeSensorLayer = controlId => {
removeCircleLayer(controlId);
removePolilineLayer(controlId);
- }
- const removeCircleLayer = (controlId) => {
+ };
+ const removeCircleLayer = controlId => {
const idx = circleLayers.findIndex(layer => layer.controlId === controlId);
circleLayers[idx].setMap(null);
setCircleLayers(prev => {
prev.splice(idx, 1);
return prev;
- })
- }
- const removePolilineLayer = (controlId) => {
+ });
+ };
+ const removePolilineLayer = controlId => {
const polilineLayers = polilineGroupLayers[controlId];
if (polilineLayers) polilineLayers.forEach(layer => layer.setMap(null));
setPolilineGroupLayers(prev => {
delete prev[controlId];
return prev;
- })
- }
+ });
+ };
// 센서레이어 모두 제거
const removeSensorLayers = () => {
circleLayers.forEach(layer => layer.setMap(null));
setCircleLayers([]);
const keys = Object.keys(polilineGroupLayers);
- keys.forEach((key) => {
+ keys.forEach(key => {
polilineGroupLayers[key].forEach(layer => layer.setMap(null));
- })
+ });
setPolilineGroupLayers({});
- }
+ };
// 레이어관리시 새로운 데이터에 없는 좌표 제거
const emtpyLayerRemove = () => {
setCircleLayers(prev => {
const remainCircleLayers = prev.filter((circleLayer, i) => {
const controlId = circleLayer.controlId;
- const findObj = controlGpList.find(controlGp => controlGp.controlId === controlId);
+ const findObj = controlGpList.find(
+ controlGp => controlGp.controlId === controlId
+ );
if (findObj) {
return circleLayer;
} else {
circleLayer.setMap(null);
}
- })
+ });
return remainCircleLayers;
- })
+ });
setPolilineGroupLayers(prev => {
const keys = Object.keys(prev);
const remainPolilineGroupLayer = {};
keys.forEach((controlId, i) => {
- const findObj = controlGpList.find(controlGp => controlGp.controlId === controlId);
+ const findObj = controlGpList.find(
+ controlGp => controlGp.controlId === controlId
+ );
if (findObj) {
remainPolilineGroupLayer[controlId] = prev[controlId];
} else {
const polilineLayers = prev[controlId];
polilineLayers.forEach(layer => {
layer.setMap(null);
- })
+ });
}
- })
+ });
return remainPolilineGroupLayer;
- })
- }
+ });
+ };
// Circle안에 격자 무늬 생성
const createCircleInGrid = (position, id, controlId, color) => {
@@ -281,14 +296,30 @@ const SensorZone = (props) => {
// 각 사분면 각도
const diff = 90 / SENSOR_RADIUS_DIVISION;
const angleQuadrant1 = diff * i;
- const angleQuadrant2 = 180 - (diff * i);
- const angleQuadrant3 = 180 + (diff * i);
+ const angleQuadrant2 = 180 - diff * i;
+ const angleQuadrant3 = 180 + diff * i;
const angleQuadrant4 = diff * -i;
// 각 사분면 좌표
- const coord1 = new naver.maps.EPSG3857.getDestinationCoord(position, angleQuadrant1, SENSOR_RADIUS);
- const coord2 = new naver.maps.EPSG3857.getDestinationCoord(position, angleQuadrant2, SENSOR_RADIUS);
- const coord3 = new naver.maps.EPSG3857.getDestinationCoord(position, angleQuadrant3, SENSOR_RADIUS);
- const coord4 = new naver.maps.EPSG3857.getDestinationCoord(position, angleQuadrant4, SENSOR_RADIUS);
+ const coord1 = new naver.maps.EPSG3857.getDestinationCoord(
+ position,
+ angleQuadrant1,
+ SENSOR_RADIUS
+ );
+ const coord2 = new naver.maps.EPSG3857.getDestinationCoord(
+ position,
+ angleQuadrant2,
+ SENSOR_RADIUS
+ );
+ const coord3 = new naver.maps.EPSG3857.getDestinationCoord(
+ position,
+ angleQuadrant3,
+ SENSOR_RADIUS
+ );
+ const coord4 = new naver.maps.EPSG3857.getDestinationCoord(
+ position,
+ angleQuadrant4,
+ SENSOR_RADIUS
+ );
const polyline12 = new naver.maps.Polyline({
id,
position,
@@ -299,7 +330,7 @@ const SensorZone = (props) => {
strokeOpacity: 1,
strokeColor: color,
strokeStyle: 'shortdash'
- })
+ });
polilineLayers.push(polyline12);
const polyline23 = new naver.maps.Polyline({
id,
@@ -311,7 +342,7 @@ const SensorZone = (props) => {
strokeOpacity: 1,
strokeColor: color,
strokeStyle: 'shortdash'
- })
+ });
polilineLayers.push(polyline23);
const polyline34 = new naver.maps.Polyline({
id,
@@ -323,7 +354,7 @@ const SensorZone = (props) => {
strokeOpacity: 1,
strokeColor: color,
strokeStyle: 'shortdash'
- })
+ });
polilineLayers.push(polyline34);
const polyline41 = new naver.maps.Polyline({
id,
@@ -335,14 +366,14 @@ const SensorZone = (props) => {
strokeOpacity: 1,
strokeColor: color,
strokeStyle: 'shortdash'
- })
+ });
polilineLayers.push(polyline41);
}
return polilineLayers;
- }
+ };
// 환경지표 필요한 데이터로 변환
- const convtSensorData = (sensorData) => {
+ const convtSensorData = sensorData => {
const r = {
sensorDust: {
title: '미세먼지',
@@ -374,13 +405,13 @@ const SensorZone = (props) => {
text: '-',
color: undefined
}
- }
+ };
// 정수: 미세먼지 || 소수점 1자리 : 일산화탄소 || 소수점 3자리 : 오존, 이산화질소, 아황산가스
// 좋음 : 파랑, 보통 : 노랑, 나쁨 : 주황, 매우나쁨 : 빨강
// 미세먼지 : 좋음(0~30) 보통(31~80) 나쁨(81~150) 매우나쁨(151~)
if (sensorData.sensorDust != undefined && sensorData.sensorDust != null) {
- const val = r.sensorDust.value = Math.round(sensorData.sensorDust);
+ const val = (r.sensorDust.value = Math.round(sensorData.sensorDust));
if (val <= 30) {
r.sensorDust.text = '좋음';
r.sensorDust.color = '#37c9ff';
@@ -400,7 +431,8 @@ const SensorZone = (props) => {
}
// 일산화탄소 : 좋음(0~2) 보통(2.1~9) 나쁨(9.1~15) 매우나쁨(15.1~)
if (sensorData.sensorCo != undefined && sensorData.sensorCo != null) {
- const val = r.sensorCo.value = Math.round(sensorData.sensorCo * 10) / 10;
+ const val = (r.sensorCo.value =
+ Math.round(sensorData.sensorCo * 10) / 10);
if (val <= 0.2) {
r.sensorCo.text = '좋음';
r.sensorCo.color = '#37c9ff';
@@ -420,7 +452,8 @@ const SensorZone = (props) => {
}
// 아황산가스 : 좋음(0~0.02) 보통(0.021~0.05) 나쁨(0.051~0.15) 매우나쁨 (0.151 ~)
if (sensorData.sensorSo2 != undefined && sensorData.sensorSo2 != null) {
- const val = r.sensorSo2.value = Math.round(sensorData.sensorSo2 * 1000) / 1000;
+ const val = (r.sensorSo2.value =
+ Math.round(sensorData.sensorSo2 * 1000) / 1000);
if (val <= 0.02) {
r.sensorSo2.text = '좋음';
r.sensorSo2.color = '#37c9ff';
@@ -440,7 +473,8 @@ const SensorZone = (props) => {
}
// 이산화질소 : 좋음(0~0.03) 보통(0.031~0.06) 나쁨(0.061~0.2) 매우나쁨(0.201~)
if (sensorData.sensorNo2 != undefined && sensorData.sensorNo2 != null) {
- const val = r.sensorNo2.value = Math.round(sensorData.sensorNo2 * 1000) / 1000;
+ const val = (r.sensorNo2.value =
+ Math.round(sensorData.sensorNo2 * 1000) / 1000);
if (val <= 0.03) {
r.sensorNo2.text = '좋음';
r.sensorNo2.color = '#37c9ff';
@@ -457,11 +491,11 @@ const SensorZone = (props) => {
r.sensorNo2.text = '-';
r.sensorNo2.color = '#a1a1a1';
}
-
}
// 오존 : 좋음(0~0.03) 보통(0.031~0.09) 나쁨(0.091~0.15) 매우나쁨(0.151~)
if (sensorData.sensorO3 != undefined && sensorData.sensorO3 != null) {
- const val = r.sensorO3.value = Math.round(sensorData.sensorO3 * 1000) / 1000;
+ const val = (r.sensorO3.value =
+ Math.round(sensorData.sensorO3 * 1000) / 1000);
if (val <= 0.03) {
r.sensorO3.text = '좋음';
r.sensorO3.color = '#37c9ff';
@@ -480,7 +514,7 @@ const SensorZone = (props) => {
}
}
return r;
- }
+ };
return null;
};
diff --git a/src/components/mapDraw/nhn/NMap.js b/src/components/mapDraw/nhn/NMap.js
index b093f89..50f0230 100644
--- a/src/components/mapDraw/nhn/NMap.js
+++ b/src/components/mapDraw/nhn/NMap.js
@@ -7,9 +7,6 @@ export const NMap = props => {
useEffect(() => {
mapInit();
- // console.log(map);
-
- // console.log(features);
// setIsMapLoad(true);
}, []);
@@ -31,11 +28,11 @@ export const NMap = props => {
// map = ;
props.setMapObject(new naver.maps.Map('map', mapOptions));
// naver.maps.Event.addListener(map, 'click', function (e) {
- // console.log(e);
+
// });
// naver.maps.Event.addListener(map, 'idle', function (e) {
- // console.log(e);
+
// });
};
return
;
diff --git a/src/components/mapDraw/nhn/NMapMarker.js b/src/components/mapDraw/nhn/NMapMarker.js
index 0f41c6d..ceeaa08 100644
--- a/src/components/mapDraw/nhn/NMapMarker.js
+++ b/src/components/mapDraw/nhn/NMapMarker.js
@@ -25,9 +25,6 @@ export const NMapMarker = props => {
}, [props.data]);
useEffect(() => {
- // console.log('info>>>:' + props.info.lat);
- // console.log(props.selMarker);
-
if (props.selMarker && props.selMarker) {
const position = new naver.maps.LatLng(props.info?.lat, props.info?.lon);
props.selMarker?.setPosition(position);
@@ -54,7 +51,6 @@ export const NMapMarker = props => {
};
const moveMarkers = (marker, position) => {
- // console.log('dddddddddddddddddddd', marker, position);
// marker.setPositon(position);
};
diff --git a/src/components/mapDraw/nhn/NMapPolyline.js b/src/components/mapDraw/nhn/NMapPolyline.js
index 676e103..c83a47b 100644
--- a/src/components/mapDraw/nhn/NMapPolyline.js
+++ b/src/components/mapDraw/nhn/NMapPolyline.js
@@ -3,8 +3,6 @@ import { useEffect } from 'react';
export const NMapPolyline = props => {
const naver = window.naver;
- // console.log(props);
-
let polyline;
let polylinePath = [];
@@ -32,7 +30,6 @@ export const NMapPolyline = props => {
const position = new naver.maps.LatLng(item.lat, item.lon);
polylinePath.push(position);
}
- // console.log('>>>>>>>>>>>', item);
});
polyline.setPath(polylinePath);
diff --git a/src/components/message/MessageErrorModal.js b/src/components/message/MessageErrorModal.js
index b0e1297..2b933da 100644
--- a/src/components/message/MessageErrorModal.js
+++ b/src/components/message/MessageErrorModal.js
@@ -11,7 +11,7 @@ export const MessageErrorModal = props => {
);
// useEffect(() => {
- // console.log('isError>>>>>>>>>>>>>', isError);
+
// }, [isError]);
return (
diff --git a/src/components/message/MessageInfoModal.js b/src/components/message/MessageInfoModal.js
index a30125b..cc0e8ea 100644
--- a/src/components/message/MessageInfoModal.js
+++ b/src/components/message/MessageInfoModal.js
@@ -11,7 +11,7 @@ export const MessageInfoModal = props => {
useSelector(state => state.messageState);
// useEffect(() => {
- // console.log('isError>>>>>>>>>>>>>', isError);
+
// }, [isError]);
const handlerClose = () => {
dispatch(Actions.ISNO_MESSAGE());
diff --git a/src/components/websocket/WebsocketClient.js b/src/components/websocket/WebsocketClient.js
index cbaba0b..0da8a2c 100644
--- a/src/components/websocket/WebsocketClient.js
+++ b/src/components/websocket/WebsocketClient.js
@@ -8,14 +8,14 @@ const WebsocketClient = () => {
const dispatch = useDispatch();
const reConnectionTime = 5000; //5초
- const [isConnection, setIsConnection] = useState(false);
+ const [isConnection, setIsConnection] = useState(false);
useEffect(() => {
connect();
}, []);
- const connect = () => {
- let websocket = new WebSocket(WS_HOST);
+ const connect = () => {
+ let websocket = new WebSocket(WS_HOST);
websocket.onopen = () => {
setIsConnection(true);
@@ -23,13 +23,11 @@ const WebsocketClient = () => {
};
websocket.onmessage = e => {
- const data = e.data;
- const controlGpList = JSON.parse(data);
+ const data = e.data;
+ const controlGpList = JSON.parse(data);
- // console.log('gps ', controlGpList)
-
dispatch(Actions.controlGpAction.request(controlGpList));
- };
+ };
websocket.onclose = event => {
setIsConnection(false);
diff --git a/src/containers/account/mypage/AccountMypageContainer.js b/src/containers/account/mypage/AccountMypageContainer.js
index caead3f..e33c6e3 100644
--- a/src/containers/account/mypage/AccountMypageContainer.js
+++ b/src/containers/account/mypage/AccountMypageContainer.js
@@ -182,7 +182,7 @@ const AccountMypageContainer = () => {
});
}
}
- // console.log(res);
+
if (isRunning) {
clearInterval(timer);
}
@@ -300,7 +300,8 @@ const AccountMypageContainer = () => {
};
//업데이트
const handlerUpdate = () => {
- const reg_email = /^([0-9a-zA-Z_\.-]+)@([0-9a-zA-Z_-]+)(\.[0-9a-zA-Z_-]+){1,2}$/;
+ const reg_email =
+ /^([0-9a-zA-Z_\.-]+)@([0-9a-zA-Z_-]+)(\.[0-9a-zA-Z_-]+){1,2}$/;
const param = {
cstmrSno: user.cstmrSno,
email: userInfo.email,
@@ -325,12 +326,10 @@ const AccountMypageContainer = () => {
title: '탈퇴 확인',
desc: '정말로 탈퇴 하시겠습니까?'
});
-
};
const waitwait = () => {
dispatch(userDeleteAction.request(user.cstmrSno));
-
};
return (
diff --git a/src/containers/analysis/simulator/AnalysisSimulationContainer.js b/src/containers/analysis/simulator/AnalysisSimulationContainer.js
index 60b8f9b..e7123e5 100644
--- a/src/containers/analysis/simulator/AnalysisSimulationContainer.js
+++ b/src/containers/analysis/simulator/AnalysisSimulationContainer.js
@@ -53,9 +53,6 @@ export const AnalysisSimulationContainer = props => {
useEffect(() => {
if (isPlay) {
const timer = setInterval(() => {
- // console.log('count>>>>', count);
- // console.log(log[count]);
-
setInfo({ ...log[playCount], playCount: playCount });
if (log[playCount]?.srvrRcvDt) {
setTimeCd(moment(log[playCount]?.srvrRcvDt).format('HH:mm'));
@@ -93,13 +90,10 @@ export const AnalysisSimulationContainer = props => {
if (log[playCount]?.srvrRcvDt) {
setTimeCd(moment(log[playCount]?.srvrRcvDt).format('HH:mm'));
}
-
- // console.log('sliderCount>>>>', sliderCount);
}
}, [sliderCount]);
useEffect(() => {
- // console.log(log);
// let arrDate = log?.map(date => {
// const dateval = date.srvrRcvDt;
// if (dateval) {
@@ -108,17 +102,14 @@ export const AnalysisSimulationContainer = props => {
// return 0;
// }
// });
- // console.log('arrDate>', arrDate);
// setSliderVal({
// minVal: Math.min.apply(null, arrDate),
// maxVal: Math.max.apply(null, arrDate)
// });
- // console.log(Math.max.apply(null, moment(formatar rDate)));
// let maxDate = log.map(date => {
// return Math.max(date.srvrRcvDt);
// });
// let maxDate;
- // console.log('minDate :::', minDate, 'maxDate :: ', maxDate);
}, [log]);
const handlerSearch = search1 => {
diff --git a/src/containers/basis/dron/BasisDronContainer.js b/src/containers/basis/dron/BasisDronContainer.js
index e7ba7fc..eece445 100644
--- a/src/containers/basis/dron/BasisDronContainer.js
+++ b/src/containers/basis/dron/BasisDronContainer.js
@@ -126,7 +126,6 @@ export const BasisDronContainer = props => {
// minWidth: '102px',
sortable: true,
cell: row => {
- // console.log(row);
return (
{
handlerSearch();
setPageType('update');
}
- // console.log(selectData);
}, []);
useEffect(() => {
diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
index 6314924..1fe49f9 100644
--- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
+++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
@@ -181,7 +181,7 @@ const FlightPlanAprvContainer = () => {
};
const handleClickAprv = type => e => {
// notAprov, aprv
- // console.log(type, selPlanSnoList, e)
+
if (!selPlanSnoList || selPlanSnoList.length < 1) {
// alert('비행계획서를 선택해 주세요.');
// return;
diff --git a/src/containers/basis/group/BasisGroupDetailContainer.js b/src/containers/basis/group/BasisGroupDetailContainer.js
index 8239212..0bfc3c6 100644
--- a/src/containers/basis/group/BasisGroupDetailContainer.js
+++ b/src/containers/basis/group/BasisGroupDetailContainer.js
@@ -110,7 +110,7 @@ export const BasisGroupDetailContainer = () => {
// if (name == 'groupNm') {
// // const regex = /^[ㄱ-힣A-Za-z0-9]{0,11}$/;
// // if (regex.test(innerRef)) {
- // console.log(innerRef);
+
// setGroupData({
// ...groupData,
// [name]: innerRef
diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js
index a31daf9..ca002a6 100644
--- a/src/containers/basis/group/BasisGroupUsersContainer.js
+++ b/src/containers/basis/group/BasisGroupUsersContainer.js
@@ -104,8 +104,6 @@ export const BasisGroupUsersContainer = props => {
return prev;
}
});
- // console.log('내 권한 : ', my?.groupAuthCd);
- // console.log('이 사람의 권한 : ', row?.groupAuthCd);
if (row?.groupAuthCd === 'MASTER') {
return 수정불가
;
@@ -148,8 +146,6 @@ export const BasisGroupUsersContainer = props => {
return prev;
}
});
- // console.log('내 권한 : ', my?.groupAuthCd);
- // console.log('이 사람의 권한 : ', row?.groupAuthCd);
if (row?.groupAuthCd === 'LEADER') {
if (my?.groupAuthCd === 'MASTER') {
@@ -187,7 +183,7 @@ export const BasisGroupUsersContainer = props => {
}, [user]);
// useEffect(() => {
- // console.log('changeParam >>>', params);
+
// }, [params]);
useEffect(() => {
diff --git a/src/containers/system/auth/SystemAuthContainer.js b/src/containers/system/auth/SystemAuthContainer.js
index 3655067..157afe3 100644
--- a/src/containers/system/auth/SystemAuthContainer.js
+++ b/src/containers/system/auth/SystemAuthContainer.js
@@ -89,9 +89,7 @@ export const SystemAuthContainer = props => {
return;
};
- const handlerWidthrowConfirm = () => {
- // console.log('탈퇴!!!');
- };
+ const handlerWidthrowConfirm = () => {};
const handlerGroupJoin = () => {
history.push('/basis/group/join');
diff --git a/src/containers/system/code/SystemCodeContainer.js b/src/containers/system/code/SystemCodeContainer.js
index 836d7fe..2be7eed 100644
--- a/src/containers/system/code/SystemCodeContainer.js
+++ b/src/containers/system/code/SystemCodeContainer.js
@@ -83,7 +83,6 @@ export const SystemCodeContainer = props => {
const handlerCodeList = () => {
alert('코드 조회');
- // console.log('코드 조회!!!');
};
const handlerCodeDetail = () => {
diff --git a/src/containers/system/menu/SystemMenuContainer.js b/src/containers/system/menu/SystemMenuContainer.js
index b1aeae6..6251c57 100644
--- a/src/containers/system/menu/SystemMenuContainer.js
+++ b/src/containers/system/menu/SystemMenuContainer.js
@@ -83,7 +83,6 @@ export const SystemMenuContainer = props => {
const handlerCodeList = () => {
alert('코드 조회');
- // console.log('코드 조회!!!');
};
const handlerCodeDetail = () => {
diff --git a/src/containers/system/user/SystemUserContainer.js b/src/containers/system/user/SystemUserContainer.js
index a2b9d84..9174ff8 100644
--- a/src/containers/system/user/SystemUserContainer.js
+++ b/src/containers/system/user/SystemUserContainer.js
@@ -91,9 +91,7 @@ export const SystemUserContainer = props => {
return;
};
- const handlerWidthrowConfirm = () => {
- // console.log('탈퇴!!!');
- };
+ const handlerWidthrowConfirm = () => {};
const handlerGroupJoin = () => {
history.push('/basis/group/join');
diff --git a/src/modules/account/login/apis/authApi.ts b/src/modules/account/login/apis/authApi.ts
index 5d46d24..7cd7ff7 100644
--- a/src/modules/account/login/apis/authApi.ts
+++ b/src/modules/account/login/apis/authApi.ts
@@ -1,11 +1,17 @@
import axios from '../../../utils/customAxiosUtil';
-import { ResponseUser, UserAccount, TokenAccount, UserPageData,UserPw,UpdateData } from '../models/authModel';
+import {
+ ResponseUser,
+ UserAccount,
+ TokenAccount,
+ UserPageData,
+ UserPw,
+ UpdateData
+} from '../models/authModel';
import qs from 'qs';
export const authAPI = {
usersLogin: async (data: UserAccount) => {
- // console.log('>>>>>>>>>>>>>>>>>>>>>', data);
return await axios.post('api/acnt/jwt/login', data);
},
getUserProfile: async (id: number) => {
@@ -19,7 +25,7 @@ export const authAPI = {
return axios.post('api/acnt/jwt/refresh', data);
},
- getUserPage: async(id: string) => {
+ getUserPage: async (id: string) => {
return await axios.get(`api/acnt/cstmr/profile/${id}`);
},
updateUser: async (data: UpdateData) => {
@@ -27,9 +33,9 @@ export const authAPI = {
return res;
},
pwupdate: async (data: UserPw) => {
- return await axios.post('api/acnt/cstmr/profile/pswdupdate', data);
+ return await axios.post('api/acnt/cstmr/profile/pswdupdate', data);
},
- deletedata: async(id: string) => {
+ deletedata: async (id: string) => {
return await axios.post(`api/acnt/cstmr/profile/delete/${id}`);
- },
-}
+ }
+};
diff --git a/src/modules/account/login/sagas/authSaga.ts b/src/modules/account/login/sagas/authSaga.ts
index 3977dda..401ba2e 100644
--- a/src/modules/account/login/sagas/authSaga.ts
+++ b/src/modules/account/login/sagas/authSaga.ts
@@ -25,10 +25,7 @@ import { Console } from 'console';
function* userLoginSaga(action: ActionType) {
const param = action.payload;
try {
- // console.log('=-===================');
-
const { data, errorCode } = yield call(authAPI.usersLogin, param);
- //console.log('>>>>>11>>>>>>>', data);
if (errorCode == '-101') {
throw '계정 정보를 찾을 수 없습니다. 다시 확인해 주세요.';
@@ -48,7 +45,7 @@ function* userLoginSaga(action: ActionType) {
// } else {
// cookieStorage.removeCookie('SAVE_USR_ID');
// }
- // console.log('user>>>', user);
+
yield put(Actions.login.success({ ...user.data }));
} catch (error) {
yield put(Actions.login.failure(error));
@@ -61,8 +58,6 @@ function* refreshTokenSaga(action: ActionType) {
const param = action.payload;
try {
const { data, errorCode } = yield call(authAPI.refreshToken, param);
- //console.log('data>>>', data);
- //console.log('error>>>', errorCode);
// access_token 세팅
cookieStorage.setCookie(COOKIE_ACCESS_TOKEN, data.accessToken);
@@ -79,7 +74,7 @@ function* refreshTokenSaga(action: ActionType) {
function* checkAuthencationSaga() {
try {
const accessToken = cookieStorage.getCookie(COOKIE_ACCESS_TOKEN);
- // console.log('accessToken>>>>>>>>>>>>>', accessToken);
+
if (!accessToken) {
yield put(
Actions.check.success({
@@ -96,7 +91,6 @@ function* checkAuthencationSaga() {
//token 셋팅
cookieStorage.setCookie(COOKIE_ACCESS_TOKEN, accessToken);
- // console.log('>>>>>>>>>>>>>>>>>>>>>', data);
// storageService.session.setItem(STORAGE_SESSION_ICT, user.icToken);
@@ -115,14 +109,12 @@ function* checkAuthencationSaga() {
function* userLogoutSaga() {
const accessToken = cookieStorage.getCookie(COOKIE_ACCESS_TOKEN);
- //console.log('accessToken', accessToken);
try {
if (accessToken) {
- // console.log('dddddddddddddddddddddddddddddddddddd');
const decodedToken = decode(accessToken);
const res = yield call(authAPI.usersLogout, decodedToken.cstmrSno);
- // console.log('res>>>>>>>>', res);
+
if (res.data == 'SUCCESS') {
location.href = '/account/login';
}
@@ -144,7 +136,7 @@ function* userPageSaga(
const controlId = action.payload;
const { data } = yield call(authAPI.getUserPage, controlId);
- // console.log('userPageData : ', data)
+
yield put(Actions.userPageAction.success(data));
} catch (error) {
yield put(Actions.userPageAction.failure(error));
@@ -155,7 +147,7 @@ function* userDeletePageSaga(
) {
try {
const controlId = action.payload;
- // console.log('dddddddddddddddddddddddddddddddddddd');
+
const { data } = yield call(authAPI.deletedata, controlId);
if (data.result === true) {
yield put(
@@ -223,7 +215,7 @@ function* userPwSaga(
try {
const { data, errorCode } = yield call(authAPI.pwupdate, param);
//yield put(Actions.pwUpdateAction.success(data));
- // console.log("saaa",data);
+
if (data.errorCode === '-1') {
yield put(
MessageActions.IS_ERROR({
diff --git a/src/modules/account/login/service/jwtTokenUtil.ts b/src/modules/account/login/service/jwtTokenUtil.ts
index 4f80a89..1fff47a 100644
--- a/src/modules/account/login/service/jwtTokenUtil.ts
+++ b/src/modules/account/login/service/jwtTokenUtil.ts
@@ -13,7 +13,6 @@ const JWT_FLEFIX = 'palnet ';
export const checkTokenExpired = (token?: string) => {
const decodedToken = decode(token as string);
- // console.log('decodedToken>>>>>>>>>>>>>>>>>>>>>>>', decodedToken);
if (parseInt(decodedToken.exp) < moment().unix()) {
return true;
}
@@ -27,15 +26,14 @@ export const getAccessToken = async () => {
if (!token || token == undefined || token == 'undefined') {
return '';
}
- // console.log('checkTokenExpired>>>>', checkTokenExpired(token));
+
if (checkTokenExpired(token)) {
//freshtoken 으로 재발급 진행.
const refreshToken = getRefreshToken();
- // console.log('refreshToken>>', refreshToken);
+
const isRefresh = store.getState()?.authState?.isRefresh;
- // console.log('>>>>>>>>>>>>isRefresh', isRefresh);
+
if (refreshToken) {
- // console.log('33333333333333333333333');
// if (!store.getState()?.authState?.isRefresh) {
const decodeToken = decode(token as string);
const cstmrSno: number = decodeToken.cstmrSno;
@@ -67,16 +65,14 @@ const refreshTokenAPI = async (cstmrSno: number, refreshToken: string) => {
}
})
.then(response => response.json())
- .catch(error => {
- // console.log('>>>>error ', error);
- });
+ .catch(error => {});
return result;
};
export const getRefreshToken = () => {
const token = cookieStorage.getCookie(COOKIE_REFRESH_TOKEN);
- // console.log('token::::::::::', token);
+
if (
!token ||
token == undefined ||
diff --git a/src/modules/account/register/apis/accountApi.ts b/src/modules/account/register/apis/accountApi.ts
index aaaab1c..7405952 100644
--- a/src/modules/account/register/apis/accountApi.ts
+++ b/src/modules/account/register/apis/accountApi.ts
@@ -33,7 +33,6 @@ export const accountApi = {
`api/acnt/crtfyhp/register/confirm?hpno=${hpno}&crtfyNo=${crtfyNo}`
);
}
-
// list: async (data: string) => {
// const queryString = qs.stringify(data, {
@@ -52,7 +51,7 @@ export const accountApi = {
// }
// getHistory: async (id: string) => {
// if (!id) {
- // console.log(' ID is Empty');
+
// return null;
// }
// const { data }: ReponseControlGpHistory = await axios.get(
diff --git a/src/modules/account/register/reducers/accountReducer.ts b/src/modules/account/register/reducers/accountReducer.ts
index a4976e3..49bf3d4 100644
--- a/src/modules/account/register/reducers/accountReducer.ts
+++ b/src/modules/account/register/reducers/accountReducer.ts
@@ -15,7 +15,7 @@ export const accountReducer = createReducer<
// .handleAction(Actions.register.success, (state, action) =>
// produce(state, draft => {
// const res = action.payload;
- // console.log(res);
+
// })
// )
@@ -30,7 +30,7 @@ export const accountReducer = createReducer<
produce(state, draft => {
const res = action.payload;
draft.termsList = res;
- //console.log(res);
+
// draft.terms = res;
})
);
diff --git a/src/modules/account/register/sagas/accountSaga.ts b/src/modules/account/register/sagas/accountSaga.ts
index efd3e14..1f55940 100644
--- a/src/modules/account/register/sagas/accountSaga.ts
+++ b/src/modules/account/register/sagas/accountSaga.ts
@@ -13,14 +13,11 @@ import * as Models from '../models/accountModel';
function* register(action: ActionType) {
try {
- // console.log('-------------------------------');
-
const { data, agreeTerms } = action.payload;
const res = yield call(Apis.accountApi.register, { data, agreeTerms });
const resData = res.data;
- //console.log('res>>>>', res);
if (resData.errrCode > 0) {
yield put(Actions.register.success(resData));
@@ -35,16 +32,12 @@ function* register(action: ActionType) {
function* temrsList(action: ActionType) {
try {
- // console.log("-------------------------------")
-
const { langDivCd, siteCd } = action.payload;
const res = yield call(Apis.accountApi.temrsList, { langDivCd, siteCd });
const resData: Models.AccountTermsData[] = res.data;
- //console.log('>>>>>>>>>>>', resData);
-
yield put(Actions.termsList.success(resData));
} catch (error) {
yield put(Actions.termsList.failure(error));
diff --git a/src/modules/analysis/history/apis/annalysisHistoryApi.ts b/src/modules/analysis/history/apis/annalysisHistoryApi.ts
index e75df1f..c315b34 100644
--- a/src/modules/analysis/history/apis/annalysisHistoryApi.ts
+++ b/src/modules/analysis/history/apis/annalysisHistoryApi.ts
@@ -22,7 +22,7 @@ export const analysisHistory = {
}
// getHistory: async (id: string) => {
// if (!id) {
- // console.log(' ID is Empty');
+
// return null;
// }
// const { data }: ReponseControlGpHistory = await axios.get(
diff --git a/src/modules/control/gp/sagas/controlGpSaga.ts b/src/modules/control/gp/sagas/controlGpSaga.ts
index cd367a2..cd04f70 100644
--- a/src/modules/control/gp/sagas/controlGpSaga.ts
+++ b/src/modules/control/gp/sagas/controlGpSaga.ts
@@ -1,7 +1,10 @@
import { call, put, select, takeEvery } from '@redux-saga/core/effects';
import { ActionType } from 'typesafe-actions';
import { LoginData } from '../../../account/login/models/authModel';
-import { cookieStorage, COOKIE_ACCESS_TOKEN } from '../../../account/login/service/cookie';
+import {
+ cookieStorage,
+ COOKIE_ACCESS_TOKEN
+} from '../../../account/login/service/cookie';
import * as Actions from '../actions/controlGpAction';
import { controlGpApi } from '../apis/controlGpApi';
import decode from 'jwt-decode';
@@ -9,216 +12,216 @@ import { ControlGpData } from '../models/controlGpModel';
import { detail } from '../../../analysis/history/actions/analysisHistoryAction';
function* getControlGpSaga(
- action: ActionType
+ action: ActionType
) {
- try {
- const data = action.payload;
- const state = yield select();
- const { objectId, isClickObject } = state.controlMapReducer;
-
-
- // 그룹 별 기체 필터링
- const { controlGroupAuthInfo } = state.controlGroupAuthState;
- const { controlGpHistory } = state.controlGpHisState;
-
- let gpsData: ControlGpData[] = [];
-
- //사용자가 등록한 기체(식별장치 포함)만 관제에서 볼 수 있게 필터처리
- if (controlGroupAuthInfo.length > 0) {
- controlGroupAuthInfo.forEach((auth) => {
- // if (auth.groupAuthCd === 'CREATER' || auth.groupAuthCd === 'ADMIN') {
-
- if (gpsData.length > 0) return false;
-
- gpsData = data.filter(gps => auth.idntfNum === gps.objectId);
- // }
-
- // 식별장치 마다 user를 판단할 수 없기 때문에 일단 주석 처리
- // if (auth.groupAuthCd === 'USER') {
- // if (gpsData.length > 0) return false;
-
- // gpsData.filter(gps => auth.createUserId && auth.idntfNum === gps.objectId);
- // }
- });
- }
-
- // console.log('websocket data :: ', data);
-
-
- yield put(
- Actions.controlGpAction.success({
- controlGpList: data
- })
- );
-
- if (data.length > 0) {
- const controlIds: any = [];
-
- data.forEach((gps) => {
- if(gps.controlId) controlIds.push(gps.controlId);
- });
-
- const param = controlIds.join(',');
-
- const rs = yield call(controlGpApi.getArcrftWarnList, param);
-
- yield put(Actions.controlGpArcrftWarnAction.success(rs));
- }
+ try {
+ const data = action.payload;
+ const state = yield select();
+ const { objectId, isClickObject } = state.controlMapReducer;
+
+ // 그룹 별 기체 필터링
+ const { controlGroupAuthInfo } = state.controlGroupAuthState;
+ const { controlGpHistory } = state.controlGpHisState;
+
+ let gpsData: ControlGpData[] = [];
+
+ //사용자가 등록한 기체(식별장치 포함)만 관제에서 볼 수 있게 필터처리
+ if (controlGroupAuthInfo.length > 0) {
+ controlGroupAuthInfo.forEach(auth => {
+ // if (auth.groupAuthCd === 'CREATER' || auth.groupAuthCd === 'ADMIN') {
+
+ if (gpsData.length > 0) return false;
+
+ gpsData = data.filter(gps => auth.idntfNum === gps.objectId);
+ // }
+
+ // 식별장치 마다 user를 판단할 수 없기 때문에 일단 주석 처리
+ // if (auth.groupAuthCd === 'USER') {
+ // if (gpsData.length > 0) return false;
+
+ // gpsData.filter(gps => auth.createUserId && auth.idntfNum === gps.objectId);
+ // }
+ });
+ }
+
+ yield put(
+ Actions.controlGpAction.success({
+ controlGpList: data
+ })
+ );
+
+ if (data.length > 0) {
+ const controlIds: any = [];
- if (objectId && isClickObject) {
- let detailData;
+ data.forEach(gps => {
+ if (gps.controlId) controlIds.push(gps.controlId);
+ });
- //상세 정보에서 실시간 데이터 호출
- //*
- data.map(item => {
- if (item.controlId === objectId) {
- detailData = item;
- }
- });
+ const param = controlIds.join(',');
- yield put(Actions.controlGpRtDtlAction.request(detailData));
+ const rs = yield call(controlGpApi.getArcrftWarnList, param);
+
+ yield put(Actions.controlGpArcrftWarnAction.success(rs));
+ }
+
+ if (objectId && isClickObject) {
+ let detailData;
+
+ //상세 정보에서 실시간 데이터 호출
+ //*
+ data.map(item => {
+ if (item.controlId === objectId) {
+ detailData = item;
}
- } catch (error) {
- yield put(Actions.controlGpAction.failure(error));
+ });
+
+ yield put(Actions.controlGpRtDtlAction.request(detailData));
}
+ } catch (error) {
+ yield put(Actions.controlGpAction.failure(error));
+ }
}
function* getControlGpHistorySaga(
- action: ActionType
+ action: ActionType
) {
- try {
- const { id } = action.payload;
-
- const data = yield call(controlGpApi.getHistory, id);
-
- yield put(
- Actions.controlGpHisAction.success({
- controlGpHistory: data
- })
- );
- } catch (error) {
- yield put(Actions.controlGpHisAction.failure(error));
- }
+ try {
+ const { id } = action.payload;
+
+ const data = yield call(controlGpApi.getHistory, id);
+
+ yield put(
+ Actions.controlGpHisAction.success({
+ controlGpHistory: data
+ })
+ );
+ } catch (error) {
+ yield put(Actions.controlGpHisAction.failure(error));
+ }
}
function* controlGpRtDtlSaga(
- action: ActionType
+ action: ActionType
) {
- try {
- const controlGpDetail = action.payload;
-
- yield put(
- Actions.controlGpRtDtlAction.success({
- controlDetail: undefined,
- controlGpDetail: controlGpDetail
- })
- );
- } catch (error) {
- yield put(Actions.controlGpRtDtlAction.failure(error));
- }
+ try {
+ const controlGpDetail = action.payload;
+
+ yield put(
+ Actions.controlGpRtDtlAction.success({
+ controlDetail: undefined,
+ controlGpDetail: controlGpDetail
+ })
+ );
+ } catch (error) {
+ yield put(Actions.controlGpRtDtlAction.failure(error));
+ }
}
function* controlDtlSaga(
- action: ActionType
+ action: ActionType
) {
- try {
- const controlId = action.payload;
+ try {
+ const controlId = action.payload;
- const { data } = yield call(controlGpApi.getDetail, controlId);
- yield put(Actions.controlGpDtlAction.success(data));
- } catch (error) {
- yield put(Actions.controlGpDtlAction.failure(error));
- }
+ const { data } = yield call(controlGpApi.getDetail, controlId);
+ yield put(Actions.controlGpDtlAction.success(data));
+ } catch (error) {
+ yield put(Actions.controlGpDtlAction.failure(error));
+ }
}
function* controlGroupAuthSaga(
- action: ActionType
+ action: ActionType
) {
- const token = cookieStorage.getCookie(COOKIE_ACCESS_TOKEN);
-
- try {
- if (token) {
- const user = decode(token);
- const data = yield call(controlGpApi.getGroupAuth, user.cstmrSno);
-
-
- yield put(Actions.controlGroupAuthAction.success({
- controlGroupAuthInfo: data
- }));
- }
- } catch (error) {
- yield put(Actions.controlGroupAuthAction.failure(error));
+ const token = cookieStorage.getCookie(COOKIE_ACCESS_TOKEN);
+
+ try {
+ if (token) {
+ const user = decode(token);
+ const data = yield call(controlGpApi.getGroupAuth, user.cstmrSno);
+
+ yield put(
+ Actions.controlGroupAuthAction.success({
+ controlGroupAuthInfo: data
+ })
+ );
}
+ } catch (error) {
+ yield put(Actions.controlGroupAuthAction.failure(error));
+ }
}
function* controlGpFlightPlanSaga(
- action: ActionType
+ action: ActionType
) {
- try {
- const idntfNum = action.payload;
- const list = yield call(controlGpApi.getFlightPlan, idntfNum);
+ try {
+ const idntfNum = action.payload;
+ const list = yield call(controlGpApi.getFlightPlan, idntfNum);
- yield put(Actions.controlGpFlightPlanAction.success(list));
-
- } catch (error) {
- yield put(Actions.controlGpFlightPlanAction.failure(error));
- }
+ yield put(Actions.controlGpFlightPlanAction.success(list));
+ } catch (error) {
+ yield put(Actions.controlGpFlightPlanAction.failure(error));
+ }
}
function* getControlGpWarnLogSaga(
action: ActionType
) {
- try{
- const {id} = action.payload;
- const data = yield call(controlGpApi.getWarnLog, id)
+ try {
+ const { id } = action.payload;
+ const data = yield call(controlGpApi.getWarnLog, id);
- yield put(
- Actions.controlGpLogAction.success(data)
- );
- } catch(error) {
+ yield put(Actions.controlGpLogAction.success(data));
+ } catch (error) {
yield put(Actions.controlGpLogAction.failure(error));
}
}
function* controlGpFlightPlanWarnSaga(
- action: ActionType
+ action: ActionType
) {
- try {
- const idntfNum = action.payload;
-
- const rs = yield call(controlGpApi.checkPlanContains, idntfNum);
+ try {
+ const idntfNum = action.payload;
- yield put(Actions.controlGpFlightPlanWarnAction.success(rs));
+ const rs = yield call(controlGpApi.checkPlanContains, idntfNum);
- } catch (error) {
- yield put(Actions.controlGpFlightPlanWarnAction.failure(error));
- }
+ yield put(Actions.controlGpFlightPlanWarnAction.success(rs));
+ } catch (error) {
+ yield put(Actions.controlGpFlightPlanWarnAction.failure(error));
+ }
}
function* controlGpArcrftWarnSaga(
- action: ActionType
+ action: ActionType
) {
- try {
- const id = action.payload;
-
- const rs = yield call(controlGpApi.getArcrftWarnList, id);
+ try {
+ const id = action.payload;
- yield put(Actions.controlGpArcrftWarnAction.success(rs));
+ const rs = yield call(controlGpApi.getArcrftWarnList, id);
- } catch (error) {
- yield put(Actions.controlGpArcrftWarnAction.failure(error));
- }
+ yield put(Actions.controlGpArcrftWarnAction.success(rs));
+ } catch (error) {
+ yield put(Actions.controlGpArcrftWarnAction.failure(error));
+ }
}
-
export function* controlGpSaga() {
- yield takeEvery(Actions.controlGpAction.request, getControlGpSaga);
- yield takeEvery(Actions.controlGpHisAction.request, getControlGpHistorySaga);
- yield takeEvery(Actions.controlGpLogAction.request, getControlGpWarnLogSaga);
- yield takeEvery(Actions.controlGpRtDtlAction.request, controlGpRtDtlSaga);
- yield takeEvery(Actions.controlGpDtlAction.request, controlDtlSaga);
- yield takeEvery(Actions.controlGroupAuthAction.request, controlGroupAuthSaga);
- yield takeEvery(Actions.controlGpFlightPlanAction.request, controlGpFlightPlanSaga);
- yield takeEvery(Actions.controlGpFlightPlanWarnAction.request, controlGpFlightPlanWarnSaga);
- yield takeEvery(Actions.controlGpArcrftWarnAction.request, controlGpArcrftWarnSaga);
+ yield takeEvery(Actions.controlGpAction.request, getControlGpSaga);
+ yield takeEvery(Actions.controlGpHisAction.request, getControlGpHistorySaga);
+ yield takeEvery(Actions.controlGpLogAction.request, getControlGpWarnLogSaga);
+ yield takeEvery(Actions.controlGpRtDtlAction.request, controlGpRtDtlSaga);
+ yield takeEvery(Actions.controlGpDtlAction.request, controlDtlSaga);
+ yield takeEvery(Actions.controlGroupAuthAction.request, controlGroupAuthSaga);
+ yield takeEvery(
+ Actions.controlGpFlightPlanAction.request,
+ controlGpFlightPlanSaga
+ );
+ yield takeEvery(
+ Actions.controlGpFlightPlanWarnAction.request,
+ controlGpFlightPlanWarnSaga
+ );
+ yield takeEvery(
+ Actions.controlGpArcrftWarnAction.request,
+ controlGpArcrftWarnSaga
+ );
}
diff --git a/src/modules/menu/reducers/menuReducer.ts b/src/modules/menu/reducers/menuReducer.ts
index 1043402..ed0daf5 100644
--- a/src/modules/menu/reducers/menuReducer.ts
+++ b/src/modules/menu/reducers/menuReducer.ts
@@ -16,7 +16,7 @@ export const menuReducer = createReducer(
// produce(state, draft => {
// const res = action.payload;
// draft.termsList = res;
-// console.log(res);
+
// // draft.terms = res;
// })
// );
diff --git a/src/modules/utils/customAxiosUtil.ts b/src/modules/utils/customAxiosUtil.ts
index c05c1ad..a3055d6 100644
--- a/src/modules/utils/customAxiosUtil.ts
+++ b/src/modules/utils/customAxiosUtil.ts
@@ -25,14 +25,12 @@ clientInstance.interceptors.request.use(
return config;
},
error => {
- // console.log(error);
return Promise.reject(error);
}
);
clientInstance.interceptors.response.use(
response => {
- // console.log('res>>', response);
// if (response.data.errCode < 0) {
// alert('서버 처리중 오류가 발생하였습니다.');
// }
@@ -42,20 +40,15 @@ clientInstance.interceptors.response.use(
return response.data;
},
error => {
- // console.log('Error >> ', error);
const message = error?.message || '';
const name = error?.name || '';
- // console.log('res>>>>>>>>', error?.response);
- // console.log('status>>>>>>>>', error?.response?.status);
-
if (error?.response?.status == 401) {
// alert('인증정보가 없습니다. 다시 로그인해 주세요.');
// window.location.href = '/account/login';
store.dispatch(Actions.logout.request());
} else {
- // console.log('서버 응답에 실패하였습니다.');
}
return Promise.reject(error);
diff --git a/src/redux/reducers/navbar/index.js b/src/redux/reducers/navbar/index.js
index a58a31f..1322010 100644
--- a/src/redux/reducers/navbar/index.js
+++ b/src/redux/reducers/navbar/index.js
@@ -27,7 +27,6 @@ const navbarReducer = (state = initialState, action) => {
}
});
case 'CLICK_HEADER_MENU':
- // console.log('action>>>>', action);
// ** Get index to add or remove bookmark from array
const bookmarkIndex = state.bookmarks.findIndex(x => x.id === action.id);
diff --git a/src/router/Router.js b/src/router/Router.js
index 94ab55b..972226c 100644
--- a/src/router/Router.js
+++ b/src/router/Router.js
@@ -24,7 +24,6 @@ const Router = () => {
const dispatch = useDispatch();
useEffect(() => {
- // console.log('isLogin>>>>>>>>', isLogin);
if (!isLogin) {
dispatch(Actions.check.request());
}
diff --git a/src/utility/hooks/useFooterType.js b/src/utility/hooks/useFooterType.js
index 07cab04..7823728 100644
--- a/src/utility/hooks/useFooterType.js
+++ b/src/utility/hooks/useFooterType.js
@@ -1,34 +1,34 @@
// ** React Imports
-import { useState } from 'react'
+import { useState } from 'react';
// ** Configs
-import themeConfig from '@configs/themeConfig'
+import themeConfig from '@configs/themeConfig';
export const useFooterType = () => {
// ** State
const [footerType, setFooterType] = useState(() => {
try {
- return themeConfig.layout.footer.type
+ return themeConfig.layout.footer.type;
} catch (error) {
// ** If error also initialValue
- // console.log(error)
- return themeConfig.layout.footer.type
+
+ return themeConfig.layout.footer.type;
}
- })
+ });
// ** Return a wrapped version of useState's setter function
const setValue = value => {
try {
// ** Allow value to be a function so we have same API as useState
- const valueToStore = value instanceof Function ? value(footerType) : value
+ const valueToStore =
+ value instanceof Function ? value(footerType) : value;
// ** Set state
- setFooterType(valueToStore)
+ setFooterType(valueToStore);
} catch (error) {
// ** A more advanced implementation would handle the error case
- // console.log(error)
}
- }
+ };
- return [footerType, setValue]
-}
+ return [footerType, setValue];
+};
diff --git a/src/utility/hooks/useLayout.js b/src/utility/hooks/useLayout.js
index 66b805c..88a4ff2 100644
--- a/src/utility/hooks/useLayout.js
+++ b/src/utility/hooks/useLayout.js
@@ -1,57 +1,56 @@
//** React Imports
-import { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react';
// ** Configs
-import themeConfig from '@configs/themeConfig'
+import themeConfig from '@configs/themeConfig';
export const useLayout = () => {
// ** States
- const [lastLayout, setLastLayout] = useState(null)
+ const [lastLayout, setLastLayout] = useState(null);
const [layout, setLayout] = useState(() => {
try {
- return themeConfig.layout.type
+ return themeConfig.layout.type;
} catch (error) {
// ** If error return initialValue
- // console.log(error)
- return themeConfig.layout.type
+
+ return themeConfig.layout.type;
}
- })
+ });
// ** Return a wrapped version of useState's setter function
const setValue = value => {
try {
// ** Allow value to be a function so we have same API as useState
- const valueToStore = value instanceof Function ? value(layout) : value
+ const valueToStore = value instanceof Function ? value(layout) : value;
// ** Set state
- setLayout(valueToStore)
+ setLayout(valueToStore);
} catch (error) {
// ** A more advanced implementation would handle the error case
- // console.log(error)
}
- }
+ };
const handleLayout = () => {
// ** If layout is horizontal & screen size is equals to or below 1200
if (layout === 'horizontal' && window.innerWidth <= 1200) {
- setLayout('vertical')
- setLastLayout('horizontal')
+ setLayout('vertical');
+ setLastLayout('horizontal');
}
// ** If lastLayout is horizontal & screen size is equals to or above 1200
if (lastLayout === 'horizontal' && window.innerWidth >= 1200) {
- setLayout('horizontal')
+ setLayout('horizontal');
}
- }
+ };
// ** ComponentDidMount
useEffect(() => {
- handleLayout()
- }, [])
+ handleLayout();
+ }, []);
useEffect(() => {
// ** Window Resize Event
- window.addEventListener('resize', handleLayout)
- }, [layout, lastLayout])
+ window.addEventListener('resize', handleLayout);
+ }, [layout, lastLayout]);
- return [layout, setValue]
-}
+ return [layout, setValue];
+};
diff --git a/src/utility/hooks/useNavbarColor.js b/src/utility/hooks/useNavbarColor.js
index 9d7e126..b9cf9c9 100644
--- a/src/utility/hooks/useNavbarColor.js
+++ b/src/utility/hooks/useNavbarColor.js
@@ -1,34 +1,34 @@
//** React Imports
-import { useState } from 'react'
+import { useState } from 'react';
// ** Configs
-import themeConfig from '@configs/themeConfig'
+import themeConfig from '@configs/themeConfig';
export const useNavbarColor = () => {
// ** State
const [navbarColor, setNavbarColor] = useState(() => {
try {
- return themeConfig.layout.navbar.backgroundColor
+ return themeConfig.layout.navbar.backgroundColor;
} catch (error) {
// ** If error return initialValue
- // console.log(error)
- return themeConfig.layout.navbar.backgroundColor
+
+ return themeConfig.layout.navbar.backgroundColor;
}
- })
+ });
// ** Return a wrapped version of useState's setter function
const setValue = value => {
try {
// ** Allow value to be a function so we have same API as useState
- const valueToStore = value instanceof Function ? value(navbarColor) : value
+ const valueToStore =
+ value instanceof Function ? value(navbarColor) : value;
// ** Set state
- setNavbarColor(valueToStore)
+ setNavbarColor(valueToStore);
} catch (error) {
// ** A more advanced implementation would handle the error case
- // console.log(error)
}
- }
+ };
- return [navbarColor, setValue]
-}
+ return [navbarColor, setValue];
+};
diff --git a/src/utility/hooks/useNavbarType.js b/src/utility/hooks/useNavbarType.js
index 3824a5a..c3c5c77 100644
--- a/src/utility/hooks/useNavbarType.js
+++ b/src/utility/hooks/useNavbarType.js
@@ -1,34 +1,34 @@
//** React Imports
-import { useState } from 'react'
+import { useState } from 'react';
// ** Configs
-import themeConfig from '@configs/themeConfig'
+import themeConfig from '@configs/themeConfig';
export const useNavbarType = () => {
// ** State
const [navbarType, setNavbarType] = useState(() => {
try {
- return themeConfig.layout.navbar.type
+ return themeConfig.layout.navbar.type;
} catch (error) {
// ** If error return initialValue
- // console.log(error)
- return themeConfig.layout.navbar.type
+
+ return themeConfig.layout.navbar.type;
}
- })
+ });
// ** Return a wrapped version of useState's setter function
const setValue = value => {
try {
// ** Allow value to be a function so we have same API as useState
- const valueToStore = value instanceof Function ? value(navbarType) : value
+ const valueToStore =
+ value instanceof Function ? value(navbarType) : value;
// ** Set state
- setNavbarType(valueToStore)
+ setNavbarType(valueToStore);
} catch (error) {
// ** A more advanced implementation would handle the error case
- // console.log(error)
}
- }
+ };
- return [navbarType, setValue]
-}
+ return [navbarType, setValue];
+};
diff --git a/src/utility/hooks/useRTL.js b/src/utility/hooks/useRTL.js
index 54661b8..2357f90 100644
--- a/src/utility/hooks/useRTL.js
+++ b/src/utility/hooks/useRTL.js
@@ -1,38 +1,37 @@
//** React Imports
-import { useEffect } from 'react'
+import { useEffect } from 'react';
// ** Store & Actions
-import { handleRTL } from '@store/actions/layout'
-import { useDispatch, useSelector } from 'react-redux'
+import { handleRTL } from '@store/actions/layout';
+import { useDispatch, useSelector } from 'react-redux';
export const useRTL = () => {
// ** Store Vars
- const dispatch = useDispatch()
- const isRtl = useSelector(state => state.layout.isRTL)
+ const dispatch = useDispatch();
+ const isRtl = useSelector(state => state.layout.isRTL);
// ** Return a wrapped version of useState's setter function
const setValue = value => {
try {
// ** Allow value to be a function so we have same API as useState
- const valueToStore = value instanceof Function ? value(isRtl) : value
- dispatch(handleRTL(valueToStore))
+ const valueToStore = value instanceof Function ? value(isRtl) : value;
+ dispatch(handleRTL(valueToStore));
} catch (error) {
// ** A more advanced implementation would handle the error case
- // console.log(error)
}
- }
+ };
useEffect(() => {
// ** Get HTML Tag
- const element = document.getElementsByTagName('html')[0]
+ const element = document.getElementsByTagName('html')[0];
// ** If isRTL then add attr dir='rtl' with HTML else attr dir='ltr'
if (isRtl) {
- element.setAttribute('dir', 'rtl')
+ element.setAttribute('dir', 'rtl');
} else {
- element.setAttribute('dir', 'ltr')
+ element.setAttribute('dir', 'ltr');
}
- }, [isRtl])
+ }, [isRtl]);
- return [isRtl, setValue]
-}
+ return [isRtl, setValue];
+};
diff --git a/src/utility/hooks/useRouterTransition.js b/src/utility/hooks/useRouterTransition.js
index 15bb213..722d513 100644
--- a/src/utility/hooks/useRouterTransition.js
+++ b/src/utility/hooks/useRouterTransition.js
@@ -1,34 +1,34 @@
//** React Imports
-import { useState } from 'react'
+import { useState } from 'react';
// ** Configs
-import themeConfig from '@configs/themeConfig'
+import themeConfig from '@configs/themeConfig';
export const useRouterTransition = () => {
// ** State
const [transition, setTransition] = useState(() => {
try {
- return themeConfig.layout.routerTransition
+ return themeConfig.layout.routerTransition;
} catch (error) {
// ** If error return initialValue
- // console.log(error)
- return themeConfig.layout.routerTransition
+
+ return themeConfig.layout.routerTransition;
}
- })
+ });
// ** Return a wrapped version of useState's setter function
const setValue = value => {
try {
// ** Allow value to be a function so we have same API as useState
- const valueToStore = value instanceof Function ? value(transition) : value
+ const valueToStore =
+ value instanceof Function ? value(transition) : value;
// ** Set state
- setTransition(valueToStore)
+ setTransition(valueToStore);
} catch (error) {
// ** A more advanced implementation would handle the error case
- // console.log(error)
}
- }
+ };
- return [transition, setValue]
-}
+ return [transition, setValue];
+};
diff --git a/src/utility/hooks/useSkin.js b/src/utility/hooks/useSkin.js
index df523c9..d7ec8cf 100644
--- a/src/utility/hooks/useSkin.js
+++ b/src/utility/hooks/useSkin.js
@@ -1,58 +1,57 @@
//** React Imports
-import { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react';
// ** Configs
-import themeConfig from '@configs/themeConfig'
+import themeConfig from '@configs/themeConfig';
export const useSkin = () => {
// ** State
const [skin, setSkin] = useState(() => {
try {
// ** Get from local storage by key
- const item = window.localStorage.getItem('skin')
+ const item = window.localStorage.getItem('skin');
// ** Parse stored json or if none return initialValue
- return item ? JSON.parse(item) : themeConfig.layout.skin
+ return item ? JSON.parse(item) : themeConfig.layout.skin;
} catch (error) {
// ** If error also return initialValue
- // console.log(error)
- return themeConfig.layout.skin
+
+ return themeConfig.layout.skin;
}
- })
+ });
// ** Return a wrapped version of useState's setter function
const setValue = value => {
try {
// ** Allow value to be a function so we have same API as useState
- const valueToStore = value instanceof Function ? value(skin) : value
+ const valueToStore = value instanceof Function ? value(skin) : value;
// ** Set state
- setSkin(valueToStore)
+ setSkin(valueToStore);
// ** Save to local storage
- window.localStorage.setItem('skin', JSON.stringify(valueToStore))
+ window.localStorage.setItem('skin', JSON.stringify(valueToStore));
} catch (error) {
// ** A more advanced implementation would handle the error case
- // console.log(error)
}
- }
+ };
useEffect(() => {
// ** Get Body Tag
- const element = window.document.body
+ const element = window.document.body;
// ** Define classnames for skins
const classNames = {
dark: 'dark-layout',
bordered: 'bordered-layout',
'semi-dark': 'semi-dark-layout'
- }
+ };
// ** Remove all classes from Body on mount
- element.classList.remove(...element.classList)
+ element.classList.remove(...element.classList);
// ** If skin is not light add skin class
if (skin !== 'light') {
- element.classList.add(classNames[skin])
+ element.classList.add(classNames[skin]);
}
- }, [skin])
+ }, [skin]);
- return [skin, setValue]
-}
+ return [skin, setValue];
+};
diff --git a/src/views/account/AccountRegisterView.js b/src/views/account/AccountRegisterView.js
index 3ab74d9..27c62f0 100644
--- a/src/views/account/AccountRegisterView.js
+++ b/src/views/account/AccountRegisterView.js
@@ -1,7 +1,6 @@
import { AccountRegister } from '../../components/account/register/AccountRegister';
const AccountResisterView = props => {
- // console.log(props);
return ;
};
diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js
index 3543a4f..dfabca3 100644
--- a/src/views/control/main/ControlMain.js
+++ b/src/views/control/main/ControlMain.js
@@ -62,7 +62,6 @@ const ControlMain = () => {
};
const openReportDetailParam = val => {
- // console.log(val);
setOpenReportDetail(true);
};
@@ -71,17 +70,15 @@ const ControlMain = () => {
};
useEffect(() => {
-
- if(controlGpList) {
+ if (controlGpList) {
const warnGps = controlGpList.find(gps => {
- return gps.controlWarnNotyCd === true
- })
+ return gps.controlWarnNotyCd === true;
+ });
- if(warnGps) {
+ if (warnGps) {
setAlarm(true);
}
}
-
}, [controlGpList]);
return (
@@ -111,7 +108,11 @@ const ControlMain = () => {
*/}
diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js
index 372029a..9a02f1a 100644
--- a/src/views/control/report/ControlReportDetail.js
+++ b/src/views/control/report/ControlReportDetail.js
@@ -19,20 +19,20 @@ const ControlReportDetail = props => {
const dispatch = useDispatch();
const [historyModal, setHistoryModal] = useState(false);
- const { controlGpDetail, controlDetail } = useSelector(state => state.controlGpDtlState);
+ const { controlGpDetail, controlDetail } = useSelector(
+ state => state.controlGpDtlState
+ );
const { controlGpWarnLog } = useSelector(state => state.controlGpLogState);
useEffect(() => {
- if(historyModal) {
- if(controlGpDetail) {
- dispatch(controlGpLogAction.request({id : controlGpDetail.controlId}));
+ if (historyModal) {
+ if (controlGpDetail) {
+ dispatch(controlGpLogAction.request({ id: controlGpDetail.controlId }));
}
}
- }, [historyModal])
-
+ }, [historyModal]);
const handlerClose = () => {
- // console.log('================');
dispatch(objectUnClickAction());
};
@@ -58,9 +58,15 @@ const ControlReportDetail = props => {