From f032c31e22b82cce279b5c180fd850f7bb3af5a7 Mon Sep 17 00:00:00 2001 From: wx <645899409@qq.com> Date: Mon, 16 Mar 2026 16:10:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E5=90=8D=E5=B1=8F=E5=8F=8Aled?= =?UTF-8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 + .env.production | 4 + package-lock.json | 56 +++ package.json | 1 + src/assets/images/bigScreen/noData.png | Bin 0 -> 2365 bytes src/assets/images/bigScreen/user.png | Bin 0 -> 1450 bytes src/assets/images/led/headerNew.png | Bin 0 -> 10645 bytes src/utils/mqtt.js | 9 +- src/utils/serveUrl.js | 6 + src/views/dataBoard/dataBoard.vue | 659 +++++++++++++++++++++++-- src/views/led/components/info.vue | 97 ++-- src/views/led/led.vue | 377 +++++++++----- 12 files changed, 980 insertions(+), 233 deletions(-) create mode 100644 src/assets/images/bigScreen/noData.png create mode 100644 src/assets/images/bigScreen/user.png create mode 100644 src/assets/images/led/headerNew.png diff --git a/.env.development b/.env.development index 1f0b7c3..93b0761 100644 --- a/.env.development +++ b/.env.development @@ -11,3 +11,7 @@ VUE_APP_ST_MQTT_URL = 192.168.1.210 VUE_APP_ST_MQTT_PORT = 61614 VUE_APP_CT_MQTT_URL = vip.shuziweidao.com VUE_APP_CT_MQTT_PORT = 61614 +VUE_APP_LED_MQTT_URL = dev.yixiong-tech.com +VUE_APP_LED_MQTT_PORT = 18083 +VUE_APP_LED_MQTT_USERNAME = test +VUE_APP_LED_MQTT_PASSWORD = Yx123456 \ No newline at end of file diff --git a/.env.production b/.env.production index a58ef22..378785d 100644 --- a/.env.production +++ b/.env.production @@ -10,3 +10,7 @@ VUE_APP_ST_MQTT_URL = 192.168.1.210 VUE_APP_ST_MQTT_PORT = 61614 VUE_APP_CT_MQTT_URL = vip.shuziweidao.com VUE_APP_CT_MQTT_PORT = 61614 +VUE_APP_LED_MQTT_URL = dev.yixiong-tech.com +VUE_APP_LED_MQTT_PORT = 18083 +VUE_APP_LED_MQTT_USERNAME = test +VUE_APP_LED_MQTT_PASSWORD = Yx123456 diff --git a/package-lock.json b/package-lock.json index 6c42293..07c8af7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "process": "^0.11.10", "regenerator-runtime": "^0.14.1", "stream-browserify": "^3.0.0", + "swiper": "^5.4.5", "url": "^0.11.4", "util": "^0.12.5", "vue": "^2.6.14", @@ -4812,6 +4813,15 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/dom7": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz", + "integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==", + "license": "MIT", + "dependencies": { + "ssr-window": "^2.0.0" + } + }, "node_modules/domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz", @@ -9877,6 +9887,12 @@ "node": ">= 6" } }, + "node_modules/ssr-window": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz", + "integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==", + "license": "MIT" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz", @@ -10070,6 +10086,24 @@ "node": ">= 10" } }, + "node_modules/swiper": { + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-5.4.5.tgz", + "integrity": "sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "dom7": "^2.1.5", + "ssr-window": "^2.0.0" + }, + "engines": { + "node": ">= 4.7.0" + }, + "funding": { + "type": "patreon", + "url": "https://www.patreon.com/vladimirkharlampidi" + } + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz", @@ -14655,6 +14689,14 @@ } } }, + "dom7": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz", + "integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==", + "requires": { + "ssr-window": "^2.0.0" + } + }, "domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz", @@ -18378,6 +18420,11 @@ } } }, + "ssr-window": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz", + "integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz", @@ -18531,6 +18578,15 @@ } } }, + "swiper": { + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-5.4.5.tgz", + "integrity": "sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==", + "requires": { + "dom7": "^2.1.5", + "ssr-window": "^2.0.0" + } + }, "tapable": { "version": "2.2.1", "resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz", diff --git a/package.json b/package.json index 417e0d0..8df1aa6 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "process": "^0.11.10", "regenerator-runtime": "^0.14.1", "stream-browserify": "^3.0.0", + "swiper": "^5.4.5", "url": "^0.11.4", "util": "^0.12.5", "vue": "^2.6.14", diff --git a/src/assets/images/bigScreen/noData.png b/src/assets/images/bigScreen/noData.png new file mode 100644 index 0000000000000000000000000000000000000000..74aa72338f8c0f4c0a37a4d65b678c1d22b79b9b GIT binary patch literal 2365 zcmV-D3BvY?P)1&*Ga_oH?Sjby%YOUg zxwrRu&%QsGd*63o-S5nq_qpfSbME(^d(L^Dd(Mj_st`UQ={ZRkCtUAnNgE{HQ0aTB zlSCEpCh#6$H!wcIdLIX70sDc$3D#Q_^_5iSup;^$mtdWJF%kiOpJ2Tup;|k+ zC-+XF{(`6mkwby2B6(AS^>zRcMe-b=UxIZPMKy?=2lS8RB?;I4HQ)fy2z(~tx(gyr zBF_S*1#x|V%OkzZfj=aya~C$@)B{V&o^a}b4*@e1)@ev-IdGb!!!pct@dK5??38r( zaXRJ&OQY8%9g+0jr1hrNBRhb2U3HC%uXFODlyo0<@+c?I0fwceJ1rvjU}OTE;NshX zS0eemlyv(Cx8BLKqu&nTUr8%Xi^$19uSkC0#kY|e7q14!B&>G`86tlH>~LwzqThO8 zLc)4eA+jD=2sB`?&|NOA1NeCqef{#uW6QatL&T3 zz+==?Cv%J4ESpGjVTYtorFE}q5jaWG<{UTEF6nMb(=hh-~^ZcpU5WaF4ei=-bZ+xGQgl*}Z&Ptwk)%nv0Eb9LM=>v`q0*OYCWFYf}8akyC7UU|uuRyQaiD<>%u zkCW6CG_+09<&t^_dFy5CzQ>gL_8p>C8GHI#N#Bul{4ut%zoc&~<4lS1%OuE5g2a<0 z?F}0DjHEF+@=lOh7rB-%?UJ65O&H~jhvkOpk`4yCHz@y@T`?kKA76~6>g?tkDd`95 z+#4impQI%+Pfb@}-EzYeWxwhjvN5>JJ@Z%^(;yrFJXYq&ccN?|9b$)Uaon#$I3VfLAboC-{+i1FBv8%pCD-;2Ngqvv z$N>RK%Y*dsl3oh(Ozj5blp9vN_8*l^NQn};-6_~7vx9y5Qvr#e?FOWDB}|g}24XBr zlE_)gwgwgj>DL7$-l1c(6sjB^b@y^W_RZ*+iL95s#xV{C=|g3+T#PNMoQ0BBI78XE zM@2eDDW7A@h zF9Oe$P-iXRCNi7$M*^b@WiExt`A&X>?0wmgeQxD}66&iJ?8Q1pj75bq7b9{wFvwl6 z3ex?PY6Vu7(7;+j3$Wc?Us)(~F(N-0T(1kRA8~RM@V6rM)fztUA6=Hn{$4(Pq^qRy%nzc{nRX^o#7h zWS`J~H^CoY8BCrDrx20;)qRW1A_!zSR*X!{|XV^v1@`|05nF{bI5i`xk)!RIXh$hf}cg zL_?zMrr1REp6^M(gP6;x2id5@T#G*=Ln6SvagRI|^KSbSSRI%t6rS9AH=_@5650Pu zupb!XEt?B~HRLhMdyo_RvA>&G<-I@av9WPWRhm>==m4I^&N8k9l*?(+i2b9}$FL)6 jJ;=r$Yz|qAb1nW4L=Z3Btl&_*;9ym(j;-T3 zM4APEt}Iq5?Lb2zyb z5$W%3ueC4VIoa#1wRaT3P?#ig0H=XHKm}j{vXTu*LjhnI7yxbp-vj-LIx7+YI)JZ$ zNOn*@zd42Jna8x!FJ}@URpc4Q?B40pQ6j{q0Q-LXv7PE zQmLf2W{2Jj3e-Xf4j^tyY8WHyyjNhFdsA7Uhe zUZ;ucb9E0S9h(wxJ|JQ>9Sot>q+fMqXJw*L#Lu7;{-;UDrUcB)RLg8*-bu`P#x(Ju zz>*vHK>^gNq(PDzFfT`5*odOY^z;lygElR|vJxAQ21euhQaxx&!1e3waqX=g-PCX0 zloHNp&|)vl$K5C2%K+u2@#jw)uxe8YCZkSfA0G8#H0ZDuo{_P%uAj*8j zMHWid6uuguN~PrJpTi96?+V|&RprLOSOu3|!=S(#0t zP++&2@%sESpWi=Cj#1Bsvf{Y&1%jcp)>Q;U;iRA3(XnxE{qeWtgRRqMQ(IGxt-wrY zcRyY3_#azyu93!uY5<&_y?BPkUM{RqP`!B_JL{{km=jk!2?0kQk8|U;lfIb!qtj;7 z*iemLr{TV{CuN$NmqD+ke(NS2#a7y!ZaN=GkHH(tifP)hg+i-5;ADW2NQA2`?c8gB zAn90BQOY_;A-7vy|0xg0O08DWP`8=2#RdFwy_N9^X%^YOt%7~KYb9An26(NdoxAtD zBm?(0ZsoCe5?8lpNnneWYtr-Hf$iM7`c;sM}I5+cV3dXS2`gemF$s#uAx5 zM$a< z)M^!bcD{whY@%t$mPFldD1xDI3D8H1tm2!P!ZS3+6YnIGQvqf|vjl=6o`=KC&4~zt zAnC7AD9Fr=)_Ph^HU^yrgI-IHNsp}{kFvEzvH)2m5h$C#n>k1H0Kb}a9ys;CxjY&K zJ|cSc^`;de$}$MjeRrPd<)OT?TscL6&tI?rtM3Z<6X0yDF<#_eCVF3Uo|So<;)}H^ zSp)}(Z~5mH`!_@-Ut<807*qoM6N<$ Ef)kmq5Rm&M&ea3{zT7I$}o6EwI4e|*1Juj>6V zGgUJ^b*In0bNbv<9iyqPh=EFq3IhX!0Z@|De!m{RAL_`6?`PIiBM=M>HVi;c`jZdr zX`XLA#X$NWjfL)Wzz3S<`slzWg8@j+gazDRGuzigWZKmUo;hBe>&=_~{u?=ORmCVe zv9quKBBvLF&CXq0p5>RbyA2bVAHoM1`{y8N*wj)o=VvOqHnwk&u5$@-8Yi?QgR0I1 zo+{QV*6ZB!F?aPpfkGH>*Fnz?|DG#)s38CD$NKbpxCkMy`wbU0Z{mcIr`v|FPlAKc zdl$B{dFhytmk3y(stMjfzc^6S1fOZ!_KQ4Zp^>(&E7QjJ&0>qOmJKwOUNyTqog`4et_|{(w3qkeX z2A3tLVc~`Uy&NG-y^9~+V@n$! zs1lH>Np!zuu}7QB$6K)aLzm{HBjcJqXy*1&qVNW=%|N3(^r1AbOQJ>1u&wQT#??d7CC4BMdupKKzrh$q1v-Z9N$o&`alm3%0&J{cF<~bg8%kN2c+hmDxDr#wL zRyoh0GE8tRZ0R!QlXfoNeZMqND;HmIuAklMn)l03&Q`lg!%ZSR{D=p!w&0`!QZz-l z8DAFLGE8NPE(-K|Ml#_DUi_hcexUj~-hZ%YuYbb)f(E%t|AyQ;_q4TDLC|Zs-7Snv zhE0qn4bskRS2j%(TGl7VZtLd;s{Ox!^hhmAnz|N_Oz@iuX5fV}7tGK18DJD< zwliVIg4Sb)=%oX3-H1nADzz7+o=`|q_yjoLSok%+SQI!&twV9L`?qp>yZgOqiI^mK z0Mj_;EVy>2x%qVL8}gds)kNK{;UVBa{`dKAEQPf5r-h_??i98Q^-h^qwXaX%p_#7N z;FZ8(DSx`3XAt3x7~s9pIxd>;Gad+Tr^jiFJl8b+5B~vil;f*V;`R~+ym&Pm7N5_^ zhX0Lvg~H^5OiDa<3Zp>&xO{5MFCIUQ%DD$4hPXcta@oW{l*NPNwXvQe(DF3}t}yhs z+^~qWJj58?r%5*aucmShLuoS`z>fJ*qb7sZ^Sx%rFzaa@eyJUy)?X(;|N1+VIEjep zL?7%@3VTHhNZEcCvnVt6agiDmKU;tL<-i;vJel#1v9pDgNlLVFvKcK?u54v;*beP_ z+<&MEXmh>Y`b=kuF;N7k+xl@q5Xv*k3@gL5k)BZDcEH0dwHQK**$(1B?#9$0Mif$o z4w_qq6lKTEFZh070YU((B$LiuV}km$YGsr*mMaMyEeWwUcW(>)Y|MKM@0|uvVF_Kx z8ymHaR9q`u%*2gG0A6~d9CsNdA~nnH1^71j*h9_@%7STzfFO&rRqO&_M9IE4mPdvp zCN*Lj<(M#@`)^cvyezMoN6<`@8#<)Wg{HC1&N=PNQua|9{get_)eYl}gdCqB zsu5J^{wI7M6`>E-D_eR`do<}xHZjCI4k>mrKuKp-wY{B5dT5BoE!&^!Ur;dM$!!qb z1|LV6;?$Lr*&10DKH0zb0FmgP{*c1^Us4AxLP}qbjp3KV`Cp7$@4%YO@| zG_|$Nue#*uIULNZ1F3`V>kfvvcNu>5xJXaLNMD^;m)_|NDC5Os--V0}M=OgSP?sg3 zrNVNnX=Sl#E%izJL9F*%|#SfhCNlN=)Bub=Y>m8CEf}$;+a>`CTzJo=sw@R8|(Dxw+8pEphVjZ++H+p~n?+Kpi~}y5MlFf27JN zWtdx^V!{IB;l4+jjW}1r3n|7Mcq?hF-7c|TY7h3XM`pgRS+V+3zrG02bE+Jbr~L;J zT(Wih6wN`uv;?=9*L9)o&sU~tY)WDY;HEx{3G4if6*?$Hd@jr`j!vaq2qChvA>)bB)@Q){hW5_G+QNG) z_3QEz(#}|+*>}>u4Qk109iNX|8WW(qRn4 z9wVWq9mT=13nOoIpDlFarR9t?YpEPeHtlVNA?=M{!)o19E$_?sL&8pMy60tMLfRr> zfq+Skb!BZ8tOD1g+@FLcdO||C%Xx){YwJ~<#yoZjx`g>QEO8tAl9eL_8nKfq4Q^Ek z7U@Dz0vL%N1|(qLPREBo@!+2J1!(n(p7;xTmD$&1 zUCyrMS>CDEn|=iFq$Jd7ksVZ}?zYgKkI>H}QJWz5A+_gAt0pmDfUhB#^dGf@)H31V z0Ia3N6#LdMM3dmS4#~idm0VvirDs}MMXpu4JI#JXhQaMR+SV-KPgRMYlY!mY14sGr z{q6BeeBtz%OtwLT`})=XltJqa%5^*fJ4SMy(4Sc-))&fMcjUqN~M_~oW8Ud=NML%G{ zR{KygAD_By7$3~jV$|YSt$ta9TD|w#9se**w5HyvtT4XKy>{M9VRO3KU0NIV4058= zHwVdfPN!HWw0!pHcvx*GsM0gKy9iqhI{Y>U=4=XBQvu@y61GoS9SiP6Ios1>&yYwNtuVejfHEhAv|29XL*f<)h zQ{%T0A>j8gR1m5tv2mItiwIY}VdVXn_U zdE36gd((Pz^jmne?wbW4H7>G-P*HS^%ma-NoOe;(ry56AHD`s2tO;6HF(*jbP=P&x zFZ5dJ{v+Jdl8IdjRp+7tXJ@F%)%sz5N?#((9Bpm2oy8Nd zbKr(s;6=<(&D#YWSo~|-EtMgDpJkg%`~y+Gpd^HMa3}Ia;}3-laR57<0d`DIeq$20 zZ&7@%Z>{c>xTJE#dTZ#KhWy5^I+y6NJ#xVJmEI=yNX)BW+L_THS~Z4CiITqk)Dza5 zBbSVqWABs;;0gfk{n4N8ciQkV6p|r>ibB z!dkIqLYVJBz_FFYqz7cBv&*+mpCd|<%}0y`ay6?Yijf9TI)Uj4MJTRCTXX!qnttlC zvHM%0m|aPnNcz;-fCl0#*v)$;8#Bxr(e1#x+G7{rUrMdSc~53s|EJ@B^7)>sPZt|c zb!{$QOL&mjleMiSl<_Y3=iW1zSWh;@>Hf%F7Pj^k^0%zAIXQ%P5%oXSI+6TZcYFRE zVdMRZ>kS!3trZ<66H#kQ{=pDMX`7BG$)nk?m=#gmwaS`dZnFU5Y{9`Hn$^<~{>{q7 zQGc_%yTT>{o%MA`QWid>P8(A#YcB{iP9<8@C`-e#XUKXTSOF>-<*8_ftEB_@)6(yo z5zALqJy+bAX^Z8S_>nE8wkx=3oXENQPNnK;$H~Rkv}pyC*#>Yv5wh1GJJ=cBR=Ydz z1&HkqWULJD>l@$3CK}%sCmN03Mb&3WSv{xw%6w|GNhQ#bba+9c*~)v{eDr=p4cK%Q zE*;m$H67)RjTUMO9iiEk1~ObBo<+;XuU~I>X zM;wTDsd7487Be=f&k-$#CUGE7OCu}PsD!g?tWD+FjBBFCpxH)uX|<7aX7g5kc3Rt; zaZ_e-;FDep_~PTMIaKxF%aNwx|?l9;cw7iIM2nw*A4%yMnw| zV|E{<_p;YR^SQk11B1+GmR7eb2Qa1LaKOK9+a|jlwVYnfOj;YML5t*4djR4*e>$#_ zeB%%H{qCxe%2w?_ds*6!UixZz@{R(%@f*Aa-)na99i^@!nc2A-zexl=g3H>+@OYCq zMZK3W$%bS8C1c&9BNDq*DoX2-(-p#$`G6|RRa*~7eM86%aEvl=xp9+PBY43^!w_P{ z7G;9+|Ga?lEB^Jh=EO-*FNzY2NsX{RF^r8yYty zlP^#fpvwQm8Bl}#GhgbE3;geZotPKeJuK*+qQ6{+UpvY#GFpeT8uejn2hC$65J3&$ z{aQeKADbxH07+xf`tBG{=EhKF5?O=LpJSA< z430ca=ohQ|TS7awu3Bpa)c%{nLZ?SQ6_h|7v9EroK=4PQfgg7HedsCct>z zI+>4sWKFrImR{tMlRUW-`5+n;XTGuGey(v*rTKV(El)uC)SwWPH1$`m!7HB}(j>|m z|6HM7-Ffc(LB_u6e1{wvJkKQY52;mN@O!Z7ACq70chn8jVvGrig60)!+eZ~@AKT+i zd@(?L8HTs(Af=MY#+%Yq4y`9y%$7asuJ2Cj{Y1+L_nci82%tiB+I|9G+b*QubxlcKO}L|3cZ zpiEV+v^sFmu%Y@3D0;f=hyNZKL7c(N2N*VIuf1g3C<kxhUUxTvr-6|=PwvGYM?t2L3HJm0A0Y29=ehDM zis*z(3xN#zzP^K;$S*Esk97C6zP?oFZP8p;6g0{t|F$g_)BEJ^ z%-tyTgJ6Mt$L59`t_oUR&xWqZ&Z}qXAMI`_fr_cJhsV^90W3|R?9W2%n(>SgV!#>F z90}aXefJpD<;Ps$DK>msbj4i2-v%P~kmTzZ0;zaJc8w#@Fp!Niq{jWsG9^rQ`@$xL zbXY3gd!&bor;ivB9cOC^29oDwHlW6ev>)bLhlZ@$RdaG(KX*wgqRK>?Q2uM70Qbn% zcG{HKI2w}B)lDoTjuJ{nL(dytO?ybOABvu;eZIsHI4)&w-q9M%!V{gIul6?8xSevt z?KaAP>P|7d$6LY^FxS}V9VIW)ynRNqR@WxrQm1`m2vAQH8jV|7;{%~-mhd9>4+M`^ z!~+I1#p#l7^NMKYzo0v?BJ6B3_T8PAUA5hMUWq7xtaA?eKn!7*`s^thB9=A11{QIt zxp#vEp|~&hS_*4lk1m<&58Zftw`6o!b!-a0%AMd`MHW~*VOBQcX<8~$i$8p-!tPiN zK`K^vEs}6~eK@E#Xjp$tloX-Pzv}G_awY-s2FlFk20ojxRmeFGfH}fTIgQmRvr-iZ zwpfwe;o_2uLo_Tkh);pteHVz!H#k)sXKlaAxYkQIVCHbvnh7?dw5jsv^wy)vL(n`g z*#BD$QiKrJ^+DE%ONhBS)B9;V7$|;y#|taBD*DxGGM7O!PY0n41;AdHv9O*fqPo+^ z`X+?GWJy)Y!m0fU+=oVb2Jw?|bo{IH#Bm}Oj$i012_{L`L1CW@)extl7tUez9<_ZQ zvxAPFI(k3pgL?`}7m=_7^}bq1&wMdbpv~u1`Lot$e24n*ONG-w{hvv_d5-L4ZasrF zKve&Xt9AU!F27ZRxBLne+Gx-{`rKqZ-t)-A26Q60{QG%Om9QSOO>WDQzfL*Rr2F^_ z*-Jmw>LJrxzrsj_V(o+6xFu`S&rrcyuDOb#Jd4K&-RGI>akvR;*JoGWkvUr*Y(^5D z5d$^ozg=w!>umO!5WwM3r`zEg?kylSR{2(^Sc2_ziFn6g4~HZ}BsQbL5XsOa*pf#@ zgZfQ$pRX#{6Vrc}Xbl+@M7I}6cZ!jaf|SsB%ebSv()c~sEs{Zz%5h}9&uo`M^rm2OaYsRi~9 zO@|Cfi%O28-=77+VjG|V0&;QNaNnJP825m0iFChrN7K;WyjD6gUOiT_qg;uNuV1X_ z9}*%ioXuV-AP>&a!!@)fbKCcp2z8#<^gysB&%eyHJ;4@Sj)*99qJ+`6s1<;r#iDP% z3qd468ogZ&Km3-rQc+~boP&FI>2iX-_Pt+{;;B@aN zu;2+;b|W`{&hA#tw=Qn&9a4u$u$a{&tio%*b=b4_f}8v4gUD4%yJ@Mo8T9NQ8Q?K> z3nRr4$v9L{4NG#CHGJR*g{lFcOAn=m)#;Ny_08}=wX(U}&v+9*VKn>x`b#n;OLR|UxfU?THOn;1(o4@ zzCo3``ee|@gH?IGneI6h6@G_?;S9C4{4kHszF z;-bS%3Hd~uaU#RZ7&CEO%dKiATWBzK6`W!N4mC3=HmK5mqO4(ftj-6@Eg$@@^T^#~ zR*xpzQQC`b8>Rp%nc!CRa{%L9UKV$~aXpT81UXEb{!W2ieVzyR9fMjO23Cy|vjpFG zOXT;@1GFEI&ij^3klSR}3v2-GAVVv_<{aRlReJrehfmjjKu*XFO`R*(q0lf{?K z+R|PKLl<+thR?1~fdH#7<#~?r902ur(x(nb#31K@J^+iy|1RSfP2>@;u`P^jigk17 zKvk~eC6UglrH%5l`9|b+n}Gr(1&`2XG>9rNdiscR?2Oj#C+KhS(>c$6Kf-;iC)-N& zxBQnnia&~+vZaI`cJmQ_Fnx1VNb7&vdl&XrN+j6a%v4!PMfB#D!+C5hpO1<8!Orh z+PqIQLb*I~D+B8R_a$?iBrt?w?|h`U%X`%WO%)w;YX9=H%a|>6ntP1eu=TxzJ(JFG z()g^bh%CPg58$J_vPt6Gd?ZgjW&_J^wX+2)PLZSzGp&t88u^?u5u8{X|E2ZFG!Q9; zGGeIV*NtMn4RBuhRU*Bg*}^ufW1 zzxnQK;hvTfR-0=Yc@b*^DDUpcJ3o*B70Gckg2&7#{MDwn*KnII9C(9ni{%F}s`UPL z`95T)?{;5&<>`Acc3ffP-xc9Ah{k-w!zS;Q%yw&i|UHh?8 z9)`Kj4{v*F9Bd%76Ui`X|ohxX4 zgfU!3iPm_#k!3#IdAWIdQA#2a$=>g8O6>D#(NYhm^MLO4Dce=CFi=K@voB z_e@vm{tf@b5vz~Si=RqQXk|WNxN_nijk6_rthQOpt$W5%(&2Hj`Q&w2q4sBjNiGNb znIkU1@H+rgbR8EbXI;cY^iNxl)j$*3N|L$DL#iBQqL|WaP=?JtE$EEQDNp>4Y-}H) zMIl&!yqV+jvI<|~T3S#j_VQyKg}=*g4vSX(XT$_#75$%P zLmPuO*K@?7oj|+l%_%T8C;dlyqVaYjg=lM|d3Pq06#b1M4xx}4(A)K3{0kY?=JG#~ z4O!b}d%!N*o6G*7S^=qX_c6HP7NmH6Tz3`w6eD~u+w_&}Xn!d{=`}g#vI+gn9sNen zwt&i(=DG0zN=HF7xVj;^bXU6}qs4*GW+RUvBgf*+gjkJZG_MJnBx|mu(|&DNUgb|J zf<2zkQR?HyyK;h?@i)$8+q7>`o42ws1rv3`G{|OF)H6p;r{kRPhTYG_+F*->4QH=3 z*`m!R4Aqp7@BFD|cD$P!4rxI(t>-EV+>9evPQmMN7=cj7CG?whucP9S10Rn{!!IV@ z4HB_)G#~7U&=5%0U4&tt>YtrFl$yESgf{%p(I>sBZ0bDZad6nTL#=L$t(q#kd}o$? zE^$j(vzPXew*D~&RC5v?DXgNt!z>{&oN(*4qG>Q(Rkq85@?+a9Ut})#_bG%x&cnJ% z-oex+sZ`ltq0Lf3uw|Pr2b^25zWR_CT{g2d2ZY_>5!hWUqYLfT_Qc2jvHQa?4|Y@U zX@C7t3Zug;Gwve9Qmz$c0Z{0~=P{AHwBf`Zl2n zfb8Q1b-KSI9iA&zyZsK4J|7A2X(oD}&5v044Rt;eX{*_Xs^hO)wq9eTu~+JhBEyy7 z0~?fYM;wVO6uxU8?DLmWo*)1MEqO9)PmE;m?Tr;Z^3DxFD_!w+XFSU;^lk$p4hw$R z20zsc#M(6sNZhFj)!e|3Xk8xCF8YU9SQq3Z!p`L{e67i`3)M25{@K&#z!S;GXd5hX z3ld6Z{|kw+8@$m?vHtEM_9ZCt=Mll`mgk=nf0iTNuz#H|yHM6q8aeA#iW2@)x42{k z`;HYBF z(-JyVT}+QKUI03aCQhOO+Awt(uZvH zz`r=oXCk!g&2ia(K*DFvN1FAeYfHcsfn(>#uJv0;BuzHO!P;M_C#=+>8|0S(9Io~F zV|Yl3magLQ_-G6BtdWea=6LafJ)q`)hcU0NxCD}~RKT0edoTtz8r*Peu;pjV&tbO%(Z1r^K4I!Wh-B4q z5+r_b9?wa!axdu=@anA~?bZu1#@GA}V?n1#FcwMrNDucLUrQguV_wQ!YuYAI@Hb(q zU)@ZtLZ?06Dmn^_{}D-zIiG!)&x)P^xaLTu^TfnGIOL*{YvvslsyJjeXk0xVI)eq^ zU515oTdHN^-GxhAYGvXJ1W|pvzkl)0E9`@1mFU^Vbl2xJ`ot{OZaISXJ12wFmCXa( z`1+iMF{OGC%Wx$4$ab(6gsb{KOG5?na$|++EHv5uR`3j1H_-$cIz4Q6bT|r`v zXKs|#;X*2h(^SSxX)1A?aKqGZEtyGtU?IlALhiu^9*KDISP$vVp_vJxTj0XOpp*&7WwG*pTVg1dL*idc`n1YO7{lJnhzQw$HLFjZtbgYvg2Oi;X{>IMI>OpyBm2 z@313ezKb0i%l{wt-u^Uw^yG&#@Ht87Sv)Dewo)Z3C;s_Rd(g_@LR*}(iP!EGf8y_E zw~21WDd8PEL+-~ZU*>OVrQ7~O4X(oHJ=?fJRVpc*1QG$TQC@5`lYf6+Oa4U)^4@$< z?D!})@nx$c!JU(K*I9q>Lxdc4j0Nmh)Drk=WL2s1>mojCSB_YigKEqzS|F^Ev&;>p z>5}M4u)0mEmm17Qxiv>Etej&=vN}GFkfkvoMOzQ4$P>Mez={r)2`2)aLTu)?p_9N= znkU z!S&eOumZFS21GHLmU(i-t7O&P`m0@a$Q^>pbL{`93{79rA|{9r-_Z1Ka6h(z0NHcEFI~KWUfOx0{J?gVoQV^{1ys?EJ&0 z`dku!j_tWWwcf^}`7dS%-mReG1=d&z>T4X2@mGveOk_F>SQ~gom>LzBQZZEu+-USMenWls`ZFar@ohz==o#pmDDH<(-^3sDa?yf*#C;8_o%WH+}$gQ&{D-2zm9o z<@`_YTPazJs6UNZzv|nksR+;C(C$?hlg{0M0-jVm`;hwbYx$l^5~qY5`=8{|@ov{QhX3{RhS^a}(fToME{X&4Am8Hx z3pp>l*Y&A9Iq$L{j_9PI!O{kYIMS2;%(dAN4;;@>m(mh))1MZb@g1^Jvt>m(M|vU& z9SR4t-A>fT!;FpbPV~lqYfLwZ{%*)INjAe%94kFU+L}d3jLN&@5Bs+Sl`*(GvpO!E zOpI%bVfK|IULiU9bBkGNSezePYh{ zi~g}t?w;jegDz>UDY}%_{I4uGowo-NcQB^crX4ZHl+cHD=qf0bEUyeYLA$GDBV;WT z4mm^Sz5U*@^V@BoeqeFzj7S&c&P;u5lnp%d6D;SpXD8Jm{9vsDDR1~PPTJ|QH7!4n z(!uRPZwj!R>S3Rj!z=dDl>Ep2=r6a4Rwb$ft?-Pf$ zv`fusIb=f8trg53r2qWbtSU`k>ux&lpbr>g8u4CU z>YDHmGFHb#_}*g%|29DzPBk+2`A-nQ*R>$Go#+|Q^n9pevhJ@>PuU5gu?qHgwZqId zYCSxhN_-dP$WmR?V*f8Ctu->jEv{|L`Lmsf=QobG7=bFA^KDFz7kIaog|5dXk3S@a zAiR-6g#R~@RfE+HDoC>t|EuQNg^4l2Zr0y`C|898s=HPO>3h5n@N)a|1xBrZ9wyiX zt3|yglQp~*Z6&l%mc{4nyn^x>dA|vDe_sdR&vEKQo8ROoZwG#~)jjq@0F+*$SJnmL z1^9&DLS#EZ;+;sS=R`ys;tGK*Gx>I}Up+mZ)?+wmxMG)Z64ojF-2bUFK7W_mr%>lzm$bLV$sJdvodAbba4k fiTIy-f`h5Ve&o~rWsUcK2L>RoE>|mK5&C}sQq;4d literal 0 HcmV?d00001 diff --git a/src/utils/mqtt.js b/src/utils/mqtt.js index 1422a45..432a12f 100644 --- a/src/utils/mqtt.js +++ b/src/utils/mqtt.js @@ -3,11 +3,10 @@ import {getServeUrl} from "@/utils/serveUrl"; let mqttClient = null; -export const initMqtt = (clientId, topic, type) => { - console.log(getServeUrl(type + 'MqttUrl')); +export const initMqtt = (clientId, topic, type, {username='sw_mqtt', password='150326sw@', head='ws'}) => { return new Promise((resolve, reject) => { const url = { - head: "ws", // 必须是 ws 或 wss （mqtt:// 或 mqtts:// 必须让后端开放websocket服务） + head: head, // 必须是 ws 或 wss （mqtt:// 或 mqtts:// 必须让后端开放websocket服务） host: getServeUrl(type + 'MqttUrl'), // 服务地址 port: getServeUrl(type + 'MqttPORT'), // 服务端口 tailPath: "mqtt", // 服务路径 @@ -15,8 +14,8 @@ export const initMqtt = (clientId, topic, type) => { const options = { clientId: clientId, - username: "sw_mqtt", - password: "150326sw@", + username: username, + password: password, // keepalive: 60, clean: true, cleanSession: true, diff --git a/src/utils/serveUrl.js b/src/utils/serveUrl.js index 30e64ad..51c5b61 100644 --- a/src/utils/serveUrl.js +++ b/src/utils/serveUrl.js @@ -19,6 +19,12 @@ const getServeUrl = function(type) { case 'ctMqttPORT': serveUrl = process.env.VUE_APP_CT_MQTT_PORT; break; + case 'ledMqttUrl': + serveUrl = process.env.VUE_APP_LED_MQTT_URL; + break; + case 'ledMqttPORT': + serveUrl = process.env.VUE_APP_LED_MQTT_PORT; + break; } return serveUrl; }; diff --git a/src/views/dataBoard/dataBoard.vue b/src/views/dataBoard/dataBoard.vue index 85991da..0395b91 100644 --- a/src/views/dataBoard/dataBoard.vue +++ b/src/views/dataBoard/dataBoard.vue @@ -8,27 +8,45 @@
- 108 + + + 人
用餐总人数
- 919 + + + 千卡
人均热量
- 80 + + + 分
人均营养分
-
午餐（10:30~13:30）
+
{{dinnerType}} {{mealTimeStart && mealTimeEnd ? `(${mealTimeStart} ~ ${mealTimeEnd})` : ''}}
@@ -38,17 +56,9 @@
-
- - 陈*夏 89分 第一名； -
-
- - 张* 88分 第一名； -
-
- - 陈知夏 86分 第一名； +
+ + {{preName(item.name)}} {{item.userScore}}分 第{{index+1}}名；
@@ -57,12 +67,16 @@
排名
-
用户信息
-
健康得分
-
下单时间
+
用户信息
+
+ 健康得分 + +
+
下单时间
-
+ +
- +
-
用户信息
-
健康得分
-
下单时间
+
{{preName(item.name)}}
+
{{ item.userScore}}
+
{{preDate(item.orderDate)}}
+
+
+ +
+
+
+ 餐品热度排行榜 +
+
+ +
+
+ + + + +
{{item.foodName}}
+
+
+
+
+
+ + +
+
+
+
+ + 轮播图片 + + +
+
+
+
+
+
+ +
+
+
+ 欢迎用餐 +
+
+
均衡饮食很重要
你我生活都需要
+
+
+
+
-
数智餐厅
- \ No newline at end of file diff --git a/src/views/led/components/info.vue b/src/views/led/components/info.vue index da066f1..2b146af 100644 --- a/src/views/led/components/info.vue +++ b/src/views/led/components/info.vue @@ -3,7 +3,7 @@