From 4a23b23f07c69a7b44f8ea3bfc76dca7380022a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Wed, 17 May 2023 10:28:53 +0900 Subject: [PATCH 1/4] =?UTF-8?q?FineVt=20=EB=A1=9C=EA=B3=A0=20=EB=B6=99?= =?UTF-8?q?=EC=9E=84=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/menu/vertical-menu/index.js | 11 +++++++++++ src/assets/images/finevt_logo.png | Bin 0 -> 7323 bytes src/views/control/main/ControlMain.js | 16 ++++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 src/assets/images/finevt_logo.png diff --git a/src/@core/layouts/components/menu/vertical-menu/index.js b/src/@core/layouts/components/menu/vertical-menu/index.js index e01b659..7b42837 100644 --- a/src/@core/layouts/components/menu/vertical-menu/index.js +++ b/src/@core/layouts/components/menu/vertical-menu/index.js @@ -20,6 +20,8 @@ import VerticalMenuHeader from './VerticalMenuHeader'; import VerticalNavMenuItems from './VerticalNavMenuItems'; import { useSelector } from 'react-redux'; +import finevt_logo from '../../../../../assets/images/finevt_logo.png'; + const Sidebar = props => { const { topMenuCd } = useSelector(state => state.menuState); @@ -123,6 +125,15 @@ const Sidebar = props => { currentActiveItem={currentActiveItem} /> + {menuHover ? ( + + ) : ( + <> + )} )} diff --git a/src/assets/images/finevt_logo.png b/src/assets/images/finevt_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..38e492eff7a1a9da5eab436152a59cc5e660fd13 GIT binary patch literal 7323 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 { PAL +
    +
  • + +
    • +
  • { onClick={handlerLogout} />
    • - +
  • + +
    • {/* socket_off = 클래스명 변경시 빨간색! 접속이 원할하지않을때 */}
@@ -185,7 +193,11 @@ const ControlMain = () => {
- {!isClickObject ? '인천광역시' : !controlDetail?.stAreaNm ? `${controlDetail?.res.area1} ${controlDetail?.res.area2} ${controlDetail?.res.area3} ${controlDetail?.res.landNm} ${controlDetail?.res.landNum} ` : controlDetail?.stAreaNm} + {!isClickObject + ? '인천광역시' + : !controlDetail?.stAreaNm + ? `${controlDetail?.res.area1} ${controlDetail?.res.area2} ${controlDetail?.res.area3} ${controlDetail?.res.landNm} ${controlDetail?.res.landNum} ` + : controlDetail?.stAreaNm}  {weathericon()}
From 0cdd8abbd9e8f50c435b61287245f092dd89fc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Wed, 17 May 2023 11:24:13 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=8B=A4=EC=8B=9C=EA=B0=84=20=EC=98=81?= =?UTF-8?q?=EC=83=81=20=EB=B2=84=ED=8A=BC=20=EB=A7=81=ED=81=AC=EC=97=B0?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/control/report/ControlReportList.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/control/report/ControlReportList.js b/src/views/control/report/ControlReportList.js index 3c3502c..05762da 100644 --- a/src/views/control/report/ControlReportList.js +++ b/src/views/control/report/ControlReportList.js @@ -101,7 +101,8 @@ const ControlReportList = props => {
From 0eb7a4b5d884eddf7ef28f3b1d70d810daf41739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Wed, 17 May 2023 11:53:15 +0900 Subject: [PATCH 3/4] =?UTF-8?q?uam=20=EB=93=9C=EB=A1=A0=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/uam_icon.png | Bin 1819 -> 1383 bytes src/assets/images/uam_icon_purple.png | Bin 1820 -> 1387 bytes src/components/map/naver/dron/DronMarker.js | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/images/uam_icon.png b/src/assets/images/uam_icon.png index 3bbee79e75075031e40b4f4515b2887e2768c8b8..4ef5ce0dda312e6a27b5245c954f75656b7878fa 100644 GIT binary patch delta 732 zcmbQu_nb?yGr-TCmrII^fq{Y7)59eQNXvmR2OE&IHdwc4qhc`QG;lL9bulz_b+I%xadmMqakg-DG<3EwG@tyJQ3j^S5T~MLOa?I! zlMGyODN<4>E(uCavr5TNF3nBNEAe!(RjSA>&`Zfov4ZM#!=-n!5wlZ$xxt}!1_s9K zo-U3d6}R48JMA5kC~^FwIwyahv8KDMp%ar6+6s*H^A%2L(}diA~ae&b<*-g7*U4}Ct=UYvIBVeP%!pU*^u zFP>+eDJa)3eS^2gpLxH-Ti$!x^=`=;OwqfhCCI%0_c@RK*#)Up2cE7tB5jiFc>m^G zO|_3)>jN8}A7tBiL~~kU16NLFTCzcDKIe0(Gt=10-so>A?VdEV)0TIc`1`Ma-S=Fr z6)VfTG*i@N?Z4KPB@YZ@UQTJTxO=?axc{^)<7(!Y3a8G0KK`RAXK9F@+@f5EQsRUgwmbB@ z8*{r%fpcMPxnEus^T=g*|C%VjFtG00*Ap9`*c+5J>dhCNeQo&zwe{{Y?N?%MZ&;sR zc5?59teLuZOjkcTlU!V}PjkWMrK_tdYty!@db;-D1m%Kx+n!xoK0ibx>6Q)mmIj;4 zl^f0zopr E05z~L2LJ#7 delta 1172 zcmaFPHJeYdGr-TCmrII^fq{Y7)59eQNE-pM7zZ1WY+^b;aid}|g?ubY~Thq&C<-(#njEoz}&#p)z#QQNujtTC^gM0B|o_|H#M)s)5TV)BDX*< zB{RheqSwU$m)^-n%ue<8tG?~ul+2_AkpI_O(ytr@f zT;sa0FW*>J&wKv=|J{B6?|ZJg`Qm7{?-72(m>PldtdBmMGLHU@Oqy{+y#Bn}q`g1Z zZa$G>ywY&ZZFdvl=1TXNYX*#cUxaQS^`EFx*BM>own^)v-yLP+(~s}EC>a&SZ&6>h z`pBF87KzjJ)w=W+v7UeO|9y{-;Bwc7B1t8^Zrv-jy~X+U8yoliP+QmK_Gnp!IM5cM z3vWKVuC#EUvi4(o*FGhUX&0|}AK|Dk4AT*LsT96v!Erv7QxjE0Rs@BpD+K4dG)8Dj zbsU~@Z>_<1wgM|L@8xsW|E@l=Xp?hE$-d3JUk;p%IJ;>>+ovieHJ5@zzq^Ik9%ONm<8<-08|+7m&-G8U$uRqo-F0+TlR5XOuW2E5y!tL zwNq2nTYL1>9;@FhVSE3VuXkcOzx!&AFHGTEFIn6%((Iq;ksN$Ue#yDDGV4Fge7@{@ z`eTju342vO&tIJKL@@iwhB#-LmB$Y5WjS%`(~KG2#f<@*w~J0c66<%P`%A}M&hsY@ zg?r`LE=_H}#dWG)VNUALb+>Pw=X2zKP)`u%{-Bl1$zxd;gPPLW4NE`&Z?8{c^Q-7F&ps*{ zUZ-n%Tv;dJ$?kJ$XEvO%5xuL?+7)%CQ1NT0$@-gV_l*S4tZF@!Tgoi|`a(skb8+7e zg}en)58t%D-(}KeFy{f!=NT==Cw)v-cb5M$y?XOmkLbi>-9q=jF4Xuw&AR^mn$!DU z{i=RqZ7P5EoU)9Zef{?11sZJs^`^u<3Sbulz_b+K@CF>`ZuGE(uCavr5TNF3nBNEAe!(RjSA>&`Zfov4ZM##ie($5wlah=5~wE3=E97 zJzX3_DsH{GcGf#2P~!Nuu)av@z3C!j@y^)T*#^DU|0}l3pT979^%2J{2^{7d zR=nS{;y4dmA^Y-9>-Z{gvp z`sae{9?6D%kU9QA%6jFs9gfzQ10Snhbd9;bMkLi>#rhe?h3pbSpH`j-X*GY8clCw7 z%!PA357p--NoH%Ul$|<{;$9doZF3xA(_=gQY5TRqQy zRonM+X8DtMncL0?t(zUW@%4?IdEdP<+_(Czuej8qH0xfO%|@a57cZ$yx@Fn*d4}kQb@x87vu@~T;Y4YG#eg5Agb&q0>?qgtPSd^9X)|X#b6qslkJYD@< J);T3K0RaC3F6;mR delta 1173 zcmaFOHHS~JGr-TCmrII^fq{Y7)59eQNE-pM7zZ1WY+^b;aid}|mz`)$&>EaktaqGzR-`Tx|GRNohrsr+mdHYVA)9fHU z{scJGo|i?7v!lefx6G z=DBl??Y_QxV_7}#`R~7X?%hA{x#Q*Ek4an79<@to+I8$MtxyZx^6cL_CHML_y{W>T zac{2qF4;WuiN>|J`cWN;dz96(W!T++b=7+Ki0&3n+nKcKg_VTF)(#;eq%`Y9IbV%>d8-cv3n|9^^rxJoJ-2~ZRY)Q>}1B-O&j_?RcWcU79LuCw9`y+ z-{vA4on`G=Wv7osq?l-|o_N|nJ@EQYn)%!RN~ezI zZEUHp(igd&>9_w9s{-fKm#sZvlRNJ(lIKqQILGuGn%=&Xj+9w6K24?KGvxlchp^%Ra2riI^JlLXxpw$NV?G^xN~@+Qjvqt;|}r3*50+y&e{LFSl`1?mg>SFIt-SG~!75 zw%Kv>eHX|yeVcTqzHh?B<7+0Ktm-XX!p6?cF=6V{KtulLOb65Q)z@`Y&)G2jrJ%L& zyveQWr`&M!I?cB=w0?@C#_LzR^PUI0oL@del4VV=v1G{OmegE%$#V~LW_gN6D%@9_ z)M@*uPeR#Gd8&G1%jN}^rA^P)J?dG}Y2foqR7cmz>{^$d#+Lc>x}Btl1giP;x9I@Jomp|zBAI|q2awX z;_0zJw_cIq-h6=bekogWTk5l!FFZ9vt|azxukznfdDiUrw9W)SS&_Wi(myiVk16q; zwJ8j|<7Da-IrIH4l_mq3=RBWhv|K*vqw-t$^_T2bo9{|$ALVfufy-Cylm_;f|0T+qFQYZLlr*cL9?>-cs(12e { controlId: controlId, type: markerOption.type, icon: { - content: ``, + content: ``, origin: markerOption.origin, anchor: markerOption.anchor }, From d75ba1acf3d57d7957191fff82d3a00543ac6c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Wed, 17 May 2023 16:29:02 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=A4=91=EC=9D=B8=20?= =?UTF-8?q?=EA=B8=B0=EC=B2=B4=20->=20UAM=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/control/main/ControlMain.js | 28 +++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js index 61dbc05..61185a6 100644 --- a/src/views/control/main/ControlMain.js +++ b/src/views/control/main/ControlMain.js @@ -43,6 +43,11 @@ const ControlMain = () => { const { controlGpCountDrone, controlGpCountFlight } = useSelector( state => state.controlGpCountState ); + // pav박람회 -> uam, 드론 구별을 위한 임시 코드 + // (이 작업으로 고도화 하려면 추후에 서버에서 uam타입을 새로 더 받아 작업해야 함) + const [droneCount, setDroneCount] = useState(0); + const [uamCount, setUamCount] = useState(0); + const [alarm, setAlarm] = useState(false); const { user } = useSelector(state => state.authState); const [oepnReportList, setOpenReportList] = useState(false); @@ -103,6 +108,20 @@ const ControlMain = () => { } }, [isClickObject]); + useEffect(() => { + if (controlGpCountDrone) { + const uamCnt = controlGpCountDrone.filter(i => + i.gps.objectId.includes('UAM') + ); + const droneCnt = controlGpCountDrone.filter( + i => !i.gps.objectId.includes('UAM') + ); + + setUamCount(uamCnt.length); + setDroneCount(droneCnt.length); + } + }, [controlGpCountDrone]); + const handlerClose = () => { setOpenReportList(true); dispatch(objectUnClickAction()); @@ -245,11 +264,16 @@ const ControlMain = () => {
드론 {/* {controlGpList ? controlGpList.length : 0} */} - + {/* {controlGpCountDrone?.length > 0 ? controlGpCountDrone?.length : 0} - + */} + {droneCount} +
+
+ UAM + {uamCount}
항공기