From 825d10fc3560814db20ee456e65c1b34cffde80b Mon Sep 17 00:00:00 2001 From: zk Date: Tue, 12 Dec 2023 14:24:48 +0800 Subject: [PATCH] update --- .env.development | 6 +- src/assets/img/watch.png | Bin 4660 -> 4647 bytes src/assets/less/index.less | 6 + src/assets/mapUtils/commonFun.ts | 2 +- src/components/dialog/Dialog.vue | 2 + .../secondMap/components/watchListDialog.vue | 282 ++++++++++++++++++ .../secondaryScreen/secondMap/secondMap.vue | 70 ++++- .../secondMap/secondMapHooks.ts | 19 +- 8 files changed, 367 insertions(+), 20 deletions(-) create mode 100644 src/components/secondaryScreen/secondMap/components/watchListDialog.vue diff --git a/.env.development b/.env.development index 95ea17c..dbaefa2 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,4 @@ -// 王昊地址 -VITE_GLOB_API_URL=http://192.168.1.6 \ No newline at end of file +# 王昊地址 +#VITE_GLOB_API_URL=http://192.168.1.6 +#开发环境 +VITE_GLOB_API_URL=http://cqyt.dev.yg.dt.io \ No newline at end of file diff --git a/src/assets/img/watch.png b/src/assets/img/watch.png index f6672bdcbf88275393879cff17f5cdc397022b89..2a1ef9bfe2c969d5955f4fd1695f18f3d92b486b 100644 GIT binary patch delta 4641 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 XdPvgO{*d1L00000NkvXXu0mjfh#=gc delta 4654 zcmV+}64C9aB(x-uF@Nq!L_t(&L*<(Xm=#r)$IrR<)=Qn6PBfv(In(5(5go-my0ebr zy2fS5EX-hN1VzFiV*n8_t+P5hvNNOK&VcKPi%OJ?Z1@kt3I9Jp#qyE4;D2DbAmC;I=mi9l08k5g zNf^MP5&(_@!Z#2!H{;CjHvd=;wpdZIIwuJ@P6ouuK(K9#PRzwc5aKN$;w_xARbGVc ztwo^X&D_~QaV{Vv$TM(@bG=UY2fRT&7%&YpXqw#QT<#-`5awXa;bNLA#^H3vI^Bd4 z5)vD#!4ivb`hVtE?ULF86|axz0#0oW5X_bbHUdVlw#--Kt@8W104~%90H}Un-2@^c zfc#AekeCFwJ1)f&uemgbGU8$n=*D>b<@VFf0XGXOR_6=`BwqnwGPk%@Ra9G5Tj8&h zXq*edK?o2iAPgHJl?RrPk`hoL0SPOS5#y5Gv56URiGPF=3Lq*#@Y`_8*1b)^HVG=0 zj~oIHwh<6LLBFAw6jYWOx@AZ{^$$Q;T!Jc0kbg%sRZ51$ly8tqNclHWyhL+SEiEf4 z#o^YRAcPNs=1n;ByWNe!HVP`14etp~=XM#7{+fWV_YJXnUR36-CpdJV?9Z`f}rLY7DmB5V9^!AAf| z0cptx0ZI2jT`*9TUr}sY((!^@(&LtpI&w>j$OUiTp0XlJKGdd=xyJ8(K5c~v`RDblt`A34+!!``MYV<2W$ZX57%*!WB z3w47Vf(y%(pqAuB1uF$*j9{O^>Ag-Jt2kR#;jgVPsmrZ7`wvO)ePmzBQ9WRqQqT~j zAe0iqs0;+8PK{`p-BMdqjWXc;Rh+uz>1IL2vf&-T={yby&f;?w#kExduYxp{t1XiQ zmw&^ORMz4k+ICJ)Nl1xJJh<)D@z@yQ@o2(f0TFso7qjqr9-Hyr`h8k`lm> zlG5wS{gkl~Y+Rx%CcQ&)Itb7~*L&cs9p~!9{y|Vi&3x=E5xCj9z4}YjeDge+8p`$AvAU+cgZ#{A{==B9h1*TBcMo z1kFt@c-LY5+NGyp2ADqxscSvQ98gwG%Z_i|m(RkWAvh_npp;2yq;UyucSh&rOn(rf z4oXNW&fge_9OxQF#mdnS0VQip-3%5SE4gTzGA_AvcNi8d8KZ_JcuL3i@jZrg?cUr# zU4Q?D(`6S5_8lnFWSlBU2t$H|mSI4%dZx8yPUZlMkH=|S{;Ofo)nirw!u0CWx~kF( z)n(G{^2dVJd4D1RPqw>2R-`NA;i%jn)4=ykG43 z!(a9rbu}iHUQ6G6b6IAzm}hCx^59s+`WiqBOPRhRqg$(*p6dw&1^GhaNDcV7>P;&pTD^9+gqQWHNqJi=W1yGrM-JE=5O3^S${%C;H2v{ zs#IkO$?n+nj>#Fo#bKPfxo;zi=2in@e8JJ;^M0S9TO3To;9*5o5?O{RtYObA8t8~i zaH@kuvL}4Rbu%Y@Gj8E;MmXZ)-3{&MLEYT8aP}UJAytV)kvgQh8ps@D?ikIP)hoR{ z2vLJmHml+%a+)h)B;Fch0)GHKbD;375wuJ*3~HJ(PD5c3)4sc_|IEex8jH=fPu%nM zxaA*>bS5N*KpWT&EPwu>_xy=~QZ$@Mnx;kpra36<+`n}v0I+cKCe|3Jn*UDiyL861 zxM^A-lgX4xWhhv%68ema?LG6A-q(fZl~7&#PuUyBy!z2#cXFyr9)HW3l;W-z!piQ< z$IH(Yef!5UMu2J(l&KMbv9SBQ4rsOC40D+x8a9Jv97$%q|=ay;6 zgyNQE3aeG_{R!Qtz1pKOwZ8oMppAM}nTa4I6vk$CbB}%Z>yh>CPpq7MynOS2S5qbv zNxB^=BZO)Um_sR=*?$=Xm^fuqxLXKC*j3lB&MgDPRt3jO&im?ge?y=#-LhT%7yqe$ zONOQEZ4WQ`w<9(CzOHKs)D!D;W%W$U0wKzA%I1_tvVQaqAY@q4xyqudQg5{!maccb zX>gwN$>HAO{3Sj9%)i)OhQJ7q<;+Hd?!xbGQ1Jc+$BKp zxtelc_2sh_#aEI^&GlR*lg#`MkI!q{_U~5Tkeb3yx-+y=RNKj*Hc8ZLjq2Y;9*0pczj#MKI%;4=fef#Hb#5UbW?Vj7 zdAX{ru0~~ks9;v(sj8wZ!82}uv{ly$FLkxcDDCn;c`g6qXDf@|`!Mt-Os1*+zHHP|DONyR9#j=j^foU%3H`~{r4Wnt5xOLCGR zk(`#zT*<}ilCsM+6;f4IiyEp94V8Ja!Z(E&_TG+xk-@`}oEDm`!W$3x%-XYuYvMZf ziQhdr=YM<4SH&r+(oRjL z3yzf*c)dZLb1>zgY6?|2OIX?1@z!@f(JJG%M>2L#zxhCN_ALo4CXs4!3AEG9v9~7w!v&YawJ6H&lOf19M5*cVXn(G(o~c=??>EdzIAhy8*L$h)=5AH) zS|E6jp_@j*@zV1FzZK+a8kLoENKx61$_6j{tsVW2y*A~f1QTlc0RRaAi%Zh7S8W-v ze|qi#%Ui`|_jyIpa4qU|X^sv(Q`>7!rU4i0aO&oJ8w#byL061U1%^8Tv7-?%g9Rr_ zFMlXl>3S}>Y03UL)Q)tXxiTxZ%b-}jyf6re;bv4I^Tbjs;I)p;yZ@BzKxMPcq|a3+ zDyYk?IofwmZRcDMs^0qz6Hc~X3#P(ot0I8z$aws7g~Ja z!V8hZ?+?cxO!8PRW_fL1o=~0Zel& z&iL+3V~N@PO3BKRS%7RE5bP_9i|R6OMe)VzazmHhh-{nXuh80qTy>IbCh8&)koCzZWasRo&U_CPV-P{1r_8F8=%0FPpW$&cK%I8#}0Y zXRrqX?s1@@>}>{uzzzVI6|xrvfI==Jd=G{=1TO!2oVeH5QoxA)4S_avQnB>j1EAc#g4<>*MPK;J_8kv97ZiO(U;4=`rRa+rme~QYYZHCY7jKyX zzyV+Sc7e$kfq z>;Txci9YC@oF|o{zux*=yMGXN?4l2vH|jC40Pr{4KC}a1*CzU)&klP;DY|s$$95s? z*hL@o>7nBl=qtO{*a5I>6MfLxLw>G6U)}vjyAXElq7G`#%>HM2VzzwGr*;7B+C&{x z%p825Qgr#=Kih?{V;6nUS%dCTpv(5Hvjbq)Ci554O0|YzjE)pkivDTfqdtcMkur9i{BrL?3igFZr+*;M+&Pu?u0xF8ZJodW=z^ z?;YP{2f(gP^g(~oEk}XAdvdE?2s?Js2c6hugaUo%^maP{c5R{$`c$`}3iSPxyX->P zv5P+FW1R;p&=1cv`F~`X9k}{7Hv-z=cY}{+4Ui{r{H|bs6EN34!)Jp!>Y)0g9o16{ z&fn!9`g;Iv^aAzq?RzQEHRq2uBUFo2ZHc0`Z1wRSx&s8kx#sc-8y=0AGz)F(6>6%ZutOeLb)Z*c$@9;_e3?=*>EHbF^ko zEz_cqj6x)$pno3p`;!5Y3b(Tg2pWQek0P%ULR5MKSor!xFnX8Ob4t z0|~(-Fw8XhSSM$snh2=i0F|7JgI-f?{pjP$WB>YKT!!1D_0RzO01?EpaEoK^PFcV- zHY%vkuLo-g6wQ~1--SZ-(Jj7dzdoyXLVspz?2{bCPHoPvZ4JQM12vZne^i)o z?%{bm)D6~877v|E3Hj-#`_AMp{ZpwfYr55ohy4eo_-H6*!yY78og)NaHz{w|&t%>A zSeGtj+EXd(1;DeCATM z|9{p6OAh2$0^rAshvqpb2_=vZZhRxY2mnyH1)oT=OG>HQ9hjh>!p10~yD z96Xje*#tr$2LUqxM84oq4l>IDY6(It044!KG6KlQEK3C!+k!#y{;2u8)_?kR?|)XA z@v%8fgI=8D*Nf-u*xuB*8Ubt)RJv#KoIa_E9?#7Lv8N@VNEqUHtuJ_Chf|0~b$>?cJtzN&;z%lys*A+i-xBwZ6c&D;FOq zY;FRu4H}sy-}u$wq_{ZJ%c)^E6n~fr0vJdrfz?8AuL)pUhOoj9UNJ<70mKANj;$yk zKfyw;X`ZUA(2qX*#^JL1^*~ed7{mad&ory+{CeeIcGr|1-+s}Q*&hcWQp52WsRN=8DpiQU%B+`v*C+jO^0-oy k#D;-n)<+=a&X$1wADXW3*Kpi=GXMYp07*qoM6N<$f(Lu}umAu6 diff --git a/src/assets/less/index.less b/src/assets/less/index.less index 62535eb..c4218c2 100644 --- a/src/assets/less/index.less +++ b/src/assets/less/index.less @@ -57,6 +57,12 @@ background-color: rgba(0, 0, 0, 0.3); } +.nowrap { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + .ant-select-dropdown { background-color: #00152b !important; border-right: 1px solid #1b7ef2; diff --git a/src/assets/mapUtils/commonFun.ts b/src/assets/mapUtils/commonFun.ts index 9effefb..72a4659 100644 --- a/src/assets/mapUtils/commonFun.ts +++ b/src/assets/mapUtils/commonFun.ts @@ -35,7 +35,7 @@ export function typeToIcon(type: string) { return createIcon({ icon: mapIcon3, iconSize, imageSize }); } if (type == '6') { - return createIcon({ icon: watchIcon, iconSize: [21, 44], imageSize: [21, 44] }); + return createIcon({ icon: watchIcon, iconSize: [23, 51], imageSize: [23, 51] }); } } diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue index 104b5f9..cc9f755 100644 --- a/src/components/dialog/Dialog.vue +++ b/src/components/dialog/Dialog.vue @@ -35,6 +35,7 @@ width: 100%; height: 40px; background: url('../../assets/images/dialog.png') no-repeat; + background: rgba(0, 0, 0, 0.6); background-size: 100% 100%; color: #ffffff !important; padding-left: 2%; @@ -43,6 +44,7 @@ .ant-modal-header { padding: 0 !important; padding-bottom: 0; + border-bottom: none; } .ant-modal-header, diff --git a/src/components/secondaryScreen/secondMap/components/watchListDialog.vue b/src/components/secondaryScreen/secondMap/components/watchListDialog.vue new file mode 100644 index 0000000..07994d7 --- /dev/null +++ b/src/components/secondaryScreen/secondMap/components/watchListDialog.vue @@ -0,0 +1,282 @@ + + + \ No newline at end of file diff --git a/src/components/secondaryScreen/secondMap/secondMap.vue b/src/components/secondaryScreen/secondMap/secondMap.vue index 9c83a5f..967cebe 100644 --- a/src/components/secondaryScreen/secondMap/secondMap.vue +++ b/src/components/secondaryScreen/secondMap/secondMap.vue @@ -10,17 +10,23 @@
-