From 60faaca7cb2eaf1bd6485f98c67abc448a5ef6f6 Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Fri, 28 Nov 2025 09:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=B0=8F=E4=BA=8E?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E9=80=89=E6=8B=A9=E7=9A=84=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E4=BD=93=E6=89=8D=E4=BC=9A=E8=B7=B3=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/images/事件icon.png | Bin 5076 -> 9658 bytes .../composables/useMapMarkers.js | 9 ++++++--- .../3DSituationalAwarenessRefactor/index.vue | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/assets/images/事件icon.png b/packages/screen/src/views/3DSituationalAwarenessRefactor/assets/images/事件icon.png index 1b33697a1da94873fd37cc07090c66a964fb7246..1668f8b588f335f4704ba62cf5eebb42a70d085b 100644 GIT binary patch literal 9658 zcmV;rB}LkaP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91QlJ9>1ONa40RR91Qvd(}0HS=RSO5SeBuPX;RCodHoO!UG)qUU3v%KqF zq$^z^1lj;e2m}}qf!Nr=EQTgP3rvVx*Bc%?&N7ofl1~3>CNQ1MWSX(_N8_|fC-EP4 z+r*^x)Nx|h(_x@)?WBz|V`Gekgb+x&TCc9|^6t;l&-Ztp=e_SmY}&9p<0C!KS)Q}} z&iDMbbDrnD&iyp}6oH>41cDy}F*at-z)v~1V*KB6PQ{~zmj5x(c+Nwvn8-P|KDP!z z3EuT!_2?(JekgR=N5U+<&82DGrODx}pFBHvruWCsJkvS$LqHX<1%W^DfW8|*4gm!B z@Lzs>$NKtI<4ZxB-0iZ|0ittBLaa;qqywN|IB~rHZ@&HQrPKev0D7r`G!UN#z&Wme z^6A?*u3uk!4gfbTgI55U44lg{59nav@+_Up`|0oRJCgt5_y6~)_D?#X(YZpSnd<{LpAU+W@<4MXRm*vCr8l_JeE%7Z9s1aWll^y={AJFacC!dC0~|9i&e zyCC6NPsXKYf^(YeB?Xe120#@}0n^>TdH=7(W3^8hcm|{Zd)*b5d4WvY=O?2|{Lq$7 zW52lb+Qy-MFSPc5oGFd~dQKC*RFyB)ss>L2;$1*-5D<6Vbj{>@fBgeL2(o0|P$x=1 zN;m4tO7T{DL}yCW+o{XjRYYE-_FWJxerK+;_^aRhFDHKZ9JPN^3=+$JNkZ^zfOxU2KH4bHXT&_1G{uX3(&&8B*|?pL<# z9NT*8g=2q>?i}ULOT`#(3(}<+*tn7DM^`vkInC5R_7}hPogi>KJhx#~N=rTDKC{-| z(DX4hFF{s5=JG>(U4H5qX}q8E3PKmGUGIWTJ6zs5v**7*{jED2v>f5iAB(GWNr3zc zJT?xmEjd@e`wu?z(Dc=peHoebK$(jp@s*VpfFq(zI{$|joY;5S!55ty^gJh&ASzd; z;p*_ZTk|wYpZ)67fAb(-L2{Jd3Q>R8!Mxa_ZQLjW15A}JK;Hh*yMI57g3Y#KW~n8{ zh^dLOYLYKRJKqQNXTbO6?|XpZzG2Wpl!0`fqd(_P1kr{qo40MbvhmtW2cDxh_jRCt zwygIq#upt(>Bf2BfhDRR`WKJhyn6HWZ)-kz$w`*M5}AG+0n`E7i#<3IaqhDO3Ib1i z8^s2sVu4%aGe%iD9Y&kC-?nM>__t>c9zMdZDZh#u&vLz+VPwfKd|1iTI%dg4q6s*1 z-S*3WO-^>6NQ8-XC2-O(O}RjUL-TzLSmzekB1MoT?o}L(q^+y~QP0GgowmzoUan4T z-u$0;ZC$tOAidFPSjaY&-<<$87cB%&F}0JPBjcSPe*cx#M(yFO0I>wGj0LU%TY`F| z^01H=?+4GQkdQRQ^#1R%?e(m<3z2j+?sj>$6wVNuyyl4}AtBx)j zkOk4|FM`i1*WAAS(|}er;NVID>cJC$9z^3-fXrUOw)b6vXwh_x{rdKlmG~;Yw{uwXo`m>yn3yr6X;c=%)z5tZuz|=jyF@ zZvO&PZj@GbI2%B+v;n3Y`R~sno^aLDf}gNe&`p(zb*a_sl*;(~Vy#BfJb8nG(bzNr5j? zHHozJqr_TkSfsOKhh5O?t$*;LyT3f<4bQuxFE0j=POHv_F2a?LKk$kBe;!1y^4#dH zwE;NPld{}}p6n(rY{xD;iCBZNP!e_m)W>icX~AX*rBz^sWh`zKXL>M|PG8*{M9qo& zA9&=xPvS^b-VJ?up*nKtfCFTui35K9!?%4d41sSXRMg4IF}fc;BZM zTy}hhdj45?7gnmTVx<)n`98Rp4@*|ChbrfizU(Xo^^I5EGv%^BKYjGX!ll-iB^gHO z`P{^fo8XB$-1sw3+;?jfhIbfCX)+RH#JjxYLoT~LsS6hZmmWO~HyT_9b_u9(vc=E> z2+8J{3nsD0>o~~RdJRLU4OQsgxY?>xX6115;yfzjczxq7yS~|Hkvm9?X!Wg%^{^f; z&h3JL6j5@(fh*zwtg?FJ>R&aHE`3Detk9EIE*%MIN(YD84)&Ph{AmvqeHmavQXLmS zSP+o((D zUtS21D;)4$5AWU_N6~|3SOlIK7eFgOH2_Q9NF1I@T{3gX2?~Ql01FZ_;!xpeF=fH7 zo8ia_7yj(~U9cXrRz;BjB$me4qpq0Rs}N$^s8e27xb(n}f~eMb^h3Y+z~h_}T{8dj zyn!@g5ot&^2mH!y8$QEK;?f$I&UVRxw!@LQ18^|U0d0!Qa|)No5EF<3PrdrIhl9LC z`uZCY>s2ni^$tPg1G-Q(%l5v|O03AYr%tcq(%1Hd6I0V)*sy!s2A$U51>H}wKD03n z;@e)>{d|EmZbavVINH||&!*DD_p_m%o^#ZG3VTw)y_?YmS4Mmkj3X+DaL!z^Kj zUbu$4-^(p>;a&GJlD5%4STkCBVW|U}i3P?PdJS^yAlS)Td(Ad-o0B!XK*Y$Zf>GRLk=U=L)28<0gPK z2mJ0Gw?{#+yEHIzH-=m(P`OHgRVV6HjT<#5&C%;bKS^`2t(=|nExXOdiQfM~_DYQO zMnOB6<&J!sUj3r@KJ9tg*6P{-E`8-C7j&~7k9_8l&%+Qy|B|Xw2Im#d2}sB=2mBQJ z#T@XdaqobaVr{--A;u$m(M<5dzy%qfO_|Gsa@52Mwz0`8hfxTord_c8ItE(r!kcb= z^GOw0SwGg7+N)5$C6;K}cm)R#|sAkPcTa{ zjiT$`x8o|dgAbG(IONKL6MeboP>Ftp!-*6J+`Mlse1W4!s<6NS5ZsQt!{hkg2Z-Nd zPI@@=_bE)$35?vx=?+&?3no(z3E-^ zehQJUNjD-6Yd5U;PB4r}@&ET*GV7+GQfu+wV+qcjboaFy#F&|`cFFlxLtv))q!>(F>O z=NtG8rv1=eE<1t*C=_7&v>#VkLM7wIF23$2H<-x&_^bc^zx@^(8E3?$zvNj$)!tEf zN1|Qyrn=^UZ`*eH$MC$zy;WwVCC<{1rC1m4k6CNVW8NtyGdSR41LKTg(&s4)Z+MRj z#>QQI`<)jCqPphIVs>WEbD_o)k1@8_m5MbivHo$OoE+ST>ZyF@{wIFnzVp?W?*z!< zb`WZ!b<@-JdL{Uj{5B6Daw`C3u?xRZO2cXjB8n^=Wjm z-t8!-vGt$`!c*U|=e@40j8DC<*IxS5WNxtwSH7c9V3vC-dmM>1^*=$_Ais*2)4cbt zonMZt(f#)NQ)G-A?e5tbSKOH9AwqvPC2=gDq^)BHFmsvHkt4 zul?6=eiWCe$1*05GYe{aV#`J&@mq;@pwB*fTu5lV>&7d$MNx2{7hf;Br6@}$mKNF$ z58$$D*5u6bC?v21(n->f;!5dK^2W_&Oz|>zm$a%7N);`5juw}`S?GP~i=6K4_ngK! z22>H3eQS8@(h>rbyj{gk2)(VkI^yF5^qviC*G^~`C)M_pU)E*hUq{HB0;vHJ=|B#+ z_SL+u{%oEkyzBJ((VzCfX@!xoasetGNu5erc%7f(%j?xTQaHYy>S%VX4K0`s@6-XJ8(CE3b z;7%C>Pq`vLDaH0rS^Z;7>%$uBc6R7|?)S`vF-|YrQ%&v5@rSJ_^8J<1{1ffCRIWZ` znD9k|uo>OS{3{reXoM?=U5zH*5J-(h(6fluh&QfoJ^@fobHD-0oNquV#oTixgcRIb zt*v&0!-t>?4)ydIBZ|lX@$s6`r)_UsY}>>U<=kyjMu^}jC^E8E-qIia(DlB;2f>;= z)$C2ArTxHA>Hjgdjin*%B5zfwVF@qR*1Lw2dlyHmI*mqEs!b}c82Jsw`;GS6LkAp7 z9XHpk8LPPblg52g&gCUPP=WomB`KG}jvb1C*R0t*pPQ;KAQ|CSUF|gsHH2^hC@X4t z(q>(JEJML@5p7FdCP2;(?SK8R(8EZD9u=y>_fys{VxvV>ie5?;qjpxrZG<+RxMqX? zLN(7T7+ZNaAwGp>QFNe&%b`ShSfW~`11{Zo)4Ix|L6)sw<~}BBTv>{@^rSBn`_jG2AR(eu z-5Oi-Awt99c&71eEYGk=s+1alM9QH_o)QtuJgTj$Y8khnRXImiaU!^hWdVBX5#4~0&IT0;)RG& zP&F#(mrqK_P8@fgKm5FQw`4!LylB;PXQv9NjsU!mg)K(VI0)GuZLj)MB%7a9Ey37M%y9QYh8cu zi=I%bmHNqx7;D6TKep}+gFHMr%eRO;)n(ctWJ6(4AiC!Im>$Pe}&`09z%XI`p=VS@hd=aotl zW*P3eOZn6#*JT60!EFfSQ_Kq^BeJ5(*jOA#@fA@uHfKB2URfe6V&r^_8zn~k&-2hV z>KsmR#GkcVBSVY;V`2skh3J*ki2F=MsFg+*x0EuXMU!DuWlm2@=Ac$sA2&B72!RghStBctgot1!qyXqzM6u?Rd(MlM9CwBHJfMRlNC zotSpX;lq?`5=F52*o|`ji+i;Y1(-e!YQr|tvdZdS1nbV{{WA}g)loYGdK4%PWiddROyfzMfngPC|~z9zoI2LgdI{&~?>&bJd0;#gJnY1I{=0rx}#c=b+jlt~U!y?N_BVG|oAcut%SmhWkdEmg2@78x-^*<-Z z8$V}UScoz^9YEqhmMdKJ*_qXyH>CFPu6PD?p3Q&_rePj0den;WYMq!NK8eJ zQq89(CZgtm7nDIT_VU3af4yV-)-~hJ`VA5ro&Ja$1*~=^uE)D%(z4tFQTod`L-7hO z6dXbeBuaz@il`uX!f2xmg-Vs2=?i#b4}FE44+Nsg3A4JcR)vgiZ}If(sipb$De#6! zZB9bI?Qpu%5O;u za=UluZqFVOu_BZ}8i`wZv}*P0u{4fX4YCX+k*5%qyu9zVuV1r$OO@XM?FjVwQ~_ux zang6-GPTAzg2n49i;ZIhKnZFACbg`lMpZ%q)TpL}7iBUArmv~)VJ%MH$N2;r(bbzr z{<2NlZnw_N9XWO^OY?z1iv^B}3t$OA4_pc;G9W3S3CsjBR+`WJLUkSTT*qZGs-?;= zcgF#AJ+b7a*NmbHD;2Y2OL!GhQY>PJp#;)hO=p*F+O!4$YfEt~oiRX!`{W1c%;dGb zuRODP$JN=YsmYz-3-`&I!%}=Ws=2bRU_c&sewh;)XA~@InZYW{h8#OuP4FprU}fC{ zef~T#;o=DnM6zza)akaC4j(#(S7KhdMg|1LS6>&wfpHA`cn~Q|0VM@s162TWWfd;^ z&H$CxxrsRvUuCfdaA1`MsIeZaiE$%cn~%A=TmgUzNL`*x5()++C84|KnkhErV&Aly zrUNWlzlTMOlcdj|nCSt~;K=@idy*|1leL#m?}9P;TOU~Rx)is*GnIbn;50GOQhh1=X4hSFOfvnV^r{b-JDI(utXq-FAAKM>l;_+eu z4z4SKgUd25&w-^FiyM6%dnV|lH)*5uG1wevNlMzQs80-Tl|Ik~*q=Oa41!=yrPpf# zB25X8KknSqPt#->OapRp=guiWi|eW6LnZ_tiVXz=bntK5>@_<8+hw5s$=8nT>$cn7 zE3e*qQ&{Ea1qmP4V=41?2Z{s)f7qk=XMkE+0hl?+9yC2e<8l{mv=F#RPy}!$x&Ybh zF7+4jS=#O132cIB5(go=xd5@N07PIKcxG5UxZ*;Ar8az|1o&zz5dDRyw~6dJMu(0@4l>;WiC1ND&*;RfgUI%-`K^3O~XO2#1!rB zK~oVRqUZULX&h&HoYN9KfNnckXfMt$96xb9%fr4Vj-M(knZJeTN;ewU3G70QJ>axs z9-5N@DDD+G1i3wI#r>j)s4|UPm%~mO94SXHM=J9{6xG3`ilLPobyf%#cJ5qDhxp+j zg@Fl^g#CI{Y3KN%Nis1=lGOls8M~Xyk}O-tHBHsk#1lAM%`3KFy{%cRZAeee@^g<9 zBAdrrWYMd&_jF6FmGzDT>1Gqd!EOT(69($E@z%~P9`C1_w7E@M+@v%dC5vk!EKW4N z=kvyOh?RjzUE^4BpSVzjXd&P{AB!T|Te*n<*4=}t{yEmqI54%9-Z zj`~!vGR3F`l?hDGji@owx_S_ee&UiEW9tYi_;&dK^_F0<(=L{~&Q6EAWxphSFdbQD z6gM=u%swX{xIaC(E{>9-Dt>k=ZmZ8+rR;#l(KXYuh*YCH*aSSPoD}Tz^1MM0sv<^vq+Oyd;XAx*?vt!`o$IqfP7lxzJkTS%< z;lmvaPLm0FFd{?Z32(|t6Am*&=RCdASR5{gEK{Y54!o1!F2$!6QyYfkSktSvHil?Fv~a3BBE*Awzcg_#p_J0x2iCafM249J*2+@Fes8*+UwQny@B3rVt^*_ zJ12QQIY?96n=?uS{n>znVhD}l8k7O{8Zg-|Fc^p4cAV#wEQX6ts#OKHb}~V@j@%)ffRY0LU(YHlipV z^!pW7tjYvx?S8+R4hG{4G>*uRBidu|gmwZA7D2u#jKpRZhLmX1w@zQAA0@5=N8)Zf z41iN*fu-Gs44%N!b1S3RVgpWTmD8sXEP<3P2}sJ+Rwp?rD<_WRZ$5-l?feBh((Kv* zjS~phr_gjH&Pxxv*_Tj90D9vxNU`8!FT60zD6;Ht2x3vL$OkA5=B~ba5)p1%$q1O@ zOmS#17{q-nImV{~!8KO8KInEESh)s+HnV=e&Z_Ir)UewMV%h*74b&l+0+vLZ^Q*{2 zGQo~7f#G)#(2FO@IvVVuwq7d=cP{?tJ66GsO z7Ka50i0y&Y029_Bg1{an%g+WNnT;moxssT+>fL}8sEmi?!k8t1a6RfAP{8ft6*g)$ zez}{<5M%3gu1AdPr1MTM^3)Na1%TGIsR9r9GF1SmBf%mp11gISSaO{(hyq(L z+6^24lX5n|1QuZPaXT-Z1fcSO*y#5=j)P5i`0&swzf%B9V%`yuWo4Eoa2q$)-PBaQ zog{Tun5h}};5%R}5q*IwKnz&Q;OL-69#HjCjg!<$$QNFo>xy#9N-hM3;+Y0j`t?EF z=s6NZj?h|<8KI6P|1+XOVY(mQ?ZxajD z{oA%x*J=+Q$CBQPIMkY9m=u>FTbTeB*8=PitOE2QU^U)3m*ADLHGbVqfDrONf0?cf z0#8=I0MDM4Y4aH{HdyIN9nkLCQ*z$0{rLh|4u9T2mK}`7`R?5ncl4;v?kY>zmk_^n z2(C_-M>yEp2}p$!G=5U7`o>8V4?(p`R4V{fxwuNdfUr=M3rLltFfqN@vZtq@PnI8sRH~Pd3tcNVu1}v zCHMxMxJ-M0fhC{{u*NybXTj3bHJk+$=Z4EJOWilVAq6_*GSLGO9*2 z00aO40096105$*s001X{zGDCY6Fx~qK~!i3y_#u|UBz|B&%O6;^JX87G|Xu6NEQMl z1Y#)&v1|{EF`^*0;|vu{%0a0Fl@pv)DyC9d%9isbmBevy0!{_TCgsHWAO$-v69Wz@ z2?8MyVQ@e)5P`GKQEgbL`;xcWqI1Yntj=W_wt~&shb^`%EN4gTzwF;6owf&Oqx99A~`hSqHg1zA&yRS6MD=W)X3aWr znb7@qd&I`irOBPOK=I#M)`G%-HR7BVs|UPKYnC)i{0&=Z({_=7FOX)6aszqImW%|- z>Kd9a4P~XPhL!YuM8^4JfA80%z4x%3l|Zv!YwgR#erG<;jCq?Tr@#?^#g+-&1p?cz zM_+&A0z56VD@mNPgsG__OrV;xsx%u)*o?%9WU8kBksZ_^yz2dq?S*Dq;&?bP+ZuVE zIGkZQBY`y8eOocGWG<}NS~ngZ!(^nXenDL?Fl~Z)Kx2PM0vyqEe?{!;5-Jqq+>043>tCQUuj~vTqkeV~A5kcE4wzCoeQ>qJeXscCssnr)$PcC0n>(#2e z)U(40mz6*TwQN(be`TUE=v=%f!G6;w=^k&9riKrDp0~YmGP#qV-%+6W!NI~*Q10(6 zWZ(2|8!g8V*cutp2Q-pDQGHz?CIzOf@oWfu!!{1)?6qjv>i)+q^p{!a_3GNKYnuh} ztOe1euH&jdv26HVTjg)H2S;l5Md_?xwJvk?G+>dvU-f-@e|p-x%XR{Ki-Z~;?)J?d zXuOjNzO6v_eivTmrl#VfNcmY32W%p@g<=@h5FAcej-@ zS6VI{vyRG3)>=DgE%ixVr{p|lt(0$5n@%fdyLIii>B3s81%1}i*r7J}*|qy0lHmq+ zzVy>2ZAG?Ne*&%*&pqDV_9Q~Z@n#9MGvj$%YdpVIc}szu?LNF}z}jj@?1_Hdp2|a z`Hxi3SfH72zkg9%kSTi~dv!)$>=O<|M#41Y!Csb$)dm9@!arLn_Yqq(^O#*YwoT?# z5#XADH(bSgAx@y07JMCI;SD_v3pJ8PLcd_I^j&L*+COT=+7D#dci7-aWIdW&8F|83 zLW!!pf8ci@74Nt!Yb}$Wx8_t$ouZ*5-(T60@$;F^n|4k(GYjQ?vI<)eWVb1h}M?0=Wu zX${}A{>n{u_5L>{6fT}fG*w5{`-wF*@|B}AX={hTrvjR6Gg3|)QS~TNoeB3?n`A$39 z(=X{?vew2CM;H3=fgghie{cv-6PMZGKU8gfB`-I6f>KTpXt?`|w&|!aZC};2#G54! zf8daaR-9(WTOPK)>BsHz{r@5|toE!hL<)%@fQ(cD$u)HM)ACll!=az}o%YE9%+Aw- zF7)98KP&?N%w6yZ7fT18Zr5a?VcUlC;y+*J1;W?QWGp*y>+=9zF9X0e@7GAr*~p;p z%&fEYBR5}6WKE3yrZDn{8pT<)ossK6f4HO;b)8nb!PR%z1(!Z&7q5ND`ui8S@3fTYRLhPJ{4j6$g9AL^0-wqn&7tvZJ?oqpFI46Qnq2Wl+gN#OrWpaSdcW>m zGu{jbz?`{MuGMpq03l7uRkVR=0kABlCDq7Pp31gr)g^LhpSNn%sTsD~+7{d|e?Vo| zju!Nzf1=fdCg0%$Kls8Q94r;!(xUEgN`T((f$Hcp!v!ZzDiHqNFSq#T-@Lo3#_Ppo zk2)W9>kO{Bl)b?@0GJTkFoKvyAV7?qsiKLjt}Xf&sfMZxtr}bQPveRlUPWHqU8A+u zf5EV8M|=9wA3D&3F7)98KO7IWtVORt+xtRcYoDRkNC=Z}S@0 z{m)zHQbx7v`q3XDpa9|ESjt{iA%1!k@H0((*%*2M^#TXC&;v}Bbph@R&~VHXtNVSf}kPp z6HSE+qDIRfy7u(*nuCN;(1ku4BD{q!{J{Yp!YuHC6TB+@SFEV|*+b6kd{ouZ-x4{0 z&K4lDF_)XjYDJGs>?1Gwg24AmD5H9- zuD7^r&^#F-)hf{@>sx+->qmd+Ko7dmhY$Q5U-1VAc!(Ln2hL>6VhV-A-Y^#+i*L_g zktyvxT6dc>G?tN*Y!_hyO=7cU6ECApo*Hf^0^f07EbMXf%&;$msz zGtSJ=j8`=8=WjPHn5l*^!Av~oecAP+KXjl6UFgFnU990vSOp$%fe)O*+r({+C~DZ& zHCcaTraf4)Fi+Tjk%*3qNX4Gf7!frSXtvcDbK)|X*4+4bVs5G#z0a%8=`F1gM$24W zkM5OL0%;-9&iY?5f6KK?2w*aolKB+Z;_Jd-`Nv&<=s*v;&_@sOgD?Dv5y1m4@PQM& z;D&72Xjo^E^#=zB&7K$n$O3hp7J<6mpyq4=h?)sBQzkH?!lXx)zj1wkO>dgQgr8pa z$+!|<=gbOITeQl&wbzM?glH&6t!iwjcs*UM6#ltQF3dYRf6#+2^iy73;SUb*fD3%d zCXy}V0)4Xs+G38zVcs7-_^Rh^-W+Lkin3Y4jAV1heugaoQ8Q5(<_Iy~Uo z!{p%XF zfNNm)NTB!O%`hwP@|&fh<%uwY<$vmrEV$?E7JTmS&DLHk$I#SNCA!C~Z?U6?IM9br zDhT(W01vpp2Tt&UyIEQ@vFGpJ-F!*{{hG@G@QR%#f15K%u?3(KITIH%9do*$QXNo* z!L0*JqiXc~=^Tl39p>M7hagE-%#CZl)f6d6Q&RV{+nmr%FIa5Md4J~UK{uhF@PjA3 z!2up{QOH%`G(grY@>NjG*n4{P%^rbpgOKJ=E5&Y zGcD;HfAKs?zU2XnzIm@j|9G!r0RK&4s z8BV7dp-A<4QQglj~N6{8iNO1;Oo(Q@bbS|yqZkTY;!`9^lXyR z3|!tUi1xbd3ECF-ufn!m>h0x$kj!N?Yo0wb@-1|GcNR#C1!h{H2 z&LjcJn~`c_@}(IX?P?t(F^Nm@C(=3K0#FIibi;`zcuv=vvGHT~dPhILrTq~;nM({t z6h!+n8-yn(&ZLZ!loxow1wL?se;3@8Y}DGC4NLO^HBSLpqkFVk=UhgUBp`V+2&dT@ z@^dxSqTbcQ(Nq9uLIQP)3AuL;WK(0wJ^c`3zCW7bUDIT}T!Uyj;S2A5otL?!B$-z5 zkrS7POHVHa*QN+UpEe@X~RP)fX2 z_b&{8J9^2#I}YRXe9d{mi8VsWJjYiuJDckm>#CAd9#@L)#g1@aEt~^(ZyYv~CHtv&lOmRh3cvVDFo;c2sh)i5GZ&jK*!0RQ{6H@A% zYF@GLu6WM6$|JVs;3MkBe{Pa3canZew%>#wWr>MHuRDk~<&g{|YHYO7lI ziUa#w&W^GI?a5=ADj8D}_lhZ8OD(6ivwwpfZ5gzWy>XRxYz0w2PnC}7TCQjvAf5fyXFa(Aq*xAVd z2o2`t0dopia}p-2aOPO$nfH9B9qs9t3IjdpCeO)tl8HI~ zJg)b8eR9$HjF>D}X0FR6&dD_w>yO(DOE-#HK|N4+A`m9Qh?;7L7}a$x>zl6{s2*0O zZNAxuXWsLjcC@D-fBm5YJp`f;eBehWmGm$;l0<%&!v{{4_^(A>c_VM5tV!h*f!tve zNAPtWX>bZa;(U#L%B5$2q&+=M7(ri*smZxcyO^};ZL8j3P*k2sF&34lDY`4qyyrXZ zXhA8yw&Pm+*np&7HjFd~5X(!cb0he+tPvrr1-O5yN6|SR+?g z;(XS|7T@I3v#<0Wwu{ELt0}=Oa}XDSGv|s|VtdT)i6t+R1~m7Zg**`sAnk(}%c#}` zK5@f|ITOXb(l=yN#Y=5*>2e#~54GforKWSEIr~n0v*uAwbwq=)Tfcy4mbVm$lQZRz zpBA($1*arOf8KD3^Cy?wVq+Z-Yj59c>-K+p9vlFf+-VMg-6YXp67t3}hD5KdW>`fM zZ6t|$HX_NqOy&$NUs(K$HeFn2z2#fx6ZSQEHO`B20{@uw8%t{o^b3fW?O9QMO*F<- z-Dq(=r8G~@_6X)W!R?h$Mf=d`58a5(>JK%8_d%j0{PkT%)>0h+D%mPOj`e+7z>FGmqPP9j`cZudQTV>Y^*)K>(mx@=vGd~eN z!EK)+m0rk|zr*>EGO8pY-?Q@}c~cw^b2c{;+Qphn3}!>nwYqUWo)%*+$9iL`Y-1>-)QR-kxDBDCn&RIv_2&jH{%heex*d_AMQS(XUHFjp*B6J)P6vDV$D-^!R1TIsC29 zS<2#?pI#tb`!&){tMt(PnWftTj}`l>ZJAbOCugj6(S&!~&e|!z#v<88E`s;~Z^vRw z?&2+ejn({7g?|2WX20oqJ7G^N(A#xPf8V>%-OF`(UKAAaQF$WjDEG{DmihHb+UDe| zOG9lP_IJs3uU;}59L)84{Vj#Y)}0of>5r67rkOtf)B>f1xW?aKsmM3dk0rc(si^as zP{&W1KS)xmeq*K>G*+&>x~}BgVxgk diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useMapMarkers.js b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useMapMarkers.js index 2a6322f..c8d988b 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useMapMarkers.js +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useMapMarkers.js @@ -1,4 +1,4 @@ -import { ref } from 'vue' +import { inject, ref } from 'vue' import * as Cesium from 'cesium' import { cesiumDataConfig } from '../config/cesiumData' import { collapseBoundaryData } from '../config/collapseBoundary' @@ -1043,18 +1043,21 @@ export function useMapMarkers() { * @param {number} duration 动画持续时间(秒) * @param {number} pixelJumpHeight 像素跳动高度 */ - const triggerJumpAnimation = (viewer, duration = 5, pixelJumpHeight = 30) => { + const triggerJumpAnimation = (viewer, duration = 5, pixelJumpHeight = 30, disasterData) => { console.log(`[useMapMarkers] 触发像素跳动动画,持续时间 ${duration} 秒,像素高度 ${pixelJumpHeight}`) if (!viewer) { console.warn('[useMapMarkers] triggerJumpAnimation: viewer 为空') return } + const currentDistance = disasterData.forcePreset.value.searchRadius; + + console.log('currentDistance', currentDistance) const allEntities = [ ...markerEntities.value, ...emergencyResourceEntities.value, ...reserveCenterEntities.value - ].filter(e => e.billboard && e.properties?.distance?.getValue() <= 50) + ].filter(e => e.billboard && e.properties?.distance?.getValue() <= currentDistance) console.log('allEntities', allEntities) diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue index aa944d7..f937cdc 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue @@ -1130,7 +1130,7 @@ const flyToBestViewForMarkers = () => { const { camera } = mapStore.services(); // 获取当前搜索半径(公里) - const radiusKm = disasterData.forcePreset.value.searchRadius; + const radiusKm = disasterData.forcePreset.value.searchRadius + 20; // 加20km 保证能看到完整范围圈 const radiusMeters = radiusKm * 1000; // 范围圈中心点 @@ -1659,7 +1659,7 @@ provide("onDistanceChange", handleDistanceChange); // 提供 viewer 和动画方法 provide("cesiumViewer", cesiumViewer); provide("triggerJump", (duration = 5, height = 30) => { - triggerJumpAnimation(cesiumViewer.value, duration, height); + triggerJumpAnimation(cesiumViewer.value, duration, height, disasterData); });