Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

src/components/map/naver/draw/FlightPlanDraw.js

@@ -74,8 +74,8 @@ export const FlightPlanDraw_init = props => {
 
   useEffect(() => {
     if (figure) {
-      props.handleConfirm(props.areaCoordList);
       setAreaDetail(props.areaCoordList);
+      props.handleConfirm(props.areaCoordList);
     }
   }, [figure]);
 
@@ -491,14 +491,14 @@ export const FlightPlanDraw_init = props => {
 
     if (polyline) {
       var path = polyline.getPath()._array;
-      setPolyline(polyline);
+      // setPolyline(polyline);
       setAreaInfo(path);
       setFigure(polyline);
     }
 
     if (polygon) {
       var path = polygon.getPath()._array;
-      setPolygon(polygon);
+      // setPolygon(polygon);
       setAreaInfo(path);
       setFigure(polygon);
     }
@@ -512,7 +512,7 @@ export const FlightPlanDraw_init = props => {
       });
       setClickEve(Eve.clickEve);
 
-      setCircle(prev => [...prev, circle]);
+      // setCircle(prev => [...prev, circle]);
       setAreaInfo('');
       setFigure(circle);
     }
@@ -603,10 +603,10 @@ export const FlightPlanDraw_init = props => {
 
       if (areas.areaType && areas.areaType === 'LINE') {
         //polyline 생성
-        if (pastPolyline) {
+        // if (pastPolyline) {
-          pastPolyline.setMap(null);
+        pastPolyline?.setMap(null);
-          pastDragCircle.forEach(c => c.setMap(null));
+        pastDragCircle?.forEach(c => c.setMap(null));
-        }
+        // }
         polyline = new naver.maps.Polyline({
           strokeLineCap: 'round',
           strokeLineJoin: 'round',

src/configs/themeConfig.js

@@ -3,7 +3,7 @@
 //Template config options
 const themeConfig = {
   app: {
-    appName: 'DRONSYS',
+    appName: 'DRONESYS',
     // appLogoImage: require('@src/assets/images/logo/logo.svg').default,
     appLogoImage: require('../assets/images/pal_logo.png').default
   },

src/containers/basis/flight/aprv/FlightPlanAprvContainer.js

@@ -193,6 +193,21 @@ const FlightPlanAprvContainer = () => {
   useEffect(() => {
     if (searchData?.groupId) {
       handleSearch(searchData);
+
+      //승인/미승인버튼 활성/비활성 제어
+      let my = false;
+      if (user.authId === 'SUPER') {
+        my = true;
+      } else if (user.authId === 'ADMIN') {
+        if (myGroupAuthCd) {
+          my = true;
+        }
+      } else if (user.authId === 'USER') {
+        if (groupAuthCd) {
+          my = true;
+        }
+      }
+      setIsMyGroup(my);
     }
   }, [searchData]);
 

src/containers/basis/flight/plan/FlightPlanContainer.js

@@ -136,6 +136,21 @@ const FlightPlanContainer = () => {
   useEffect(() => {
     if (searchData?.groupId) {
       handleSearch(searchData);
+
+      //비행계획서 신청 버튼 활성/비활성 제어
+      let my = false;
+      if (user.authId === 'SUPER') {
+        my = true;
+      } else if (user.authId === 'ADMIN') {
+        if (myGroupAuthCd) {
+          my = true;
+        }
+      } else if (user.authId === 'USER') {
+        if (groupAuthCd) {
+          my = true;
+        }
+      }
+      setIsMyGroup(my);
     }
   }, [searchData]);