From 43489b48c2e32b8bac579645078d510cdd743f81 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Sat, 3 Feb 2024 16:50:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=8F=8C=E5=B1=8F?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 5 + src/assets/head_img/back.png | Bin 0 -> 3983 bytes src/assets/head_img/logo.png | Bin 3983 -> 2941 bytes src/components/areaList.vue | 2 +- src/components/headView.vue | 69 ++++-- src/layout/index.vue | 14 +- src/store/app.js | 3 +- src/view/delivery/components/center.vue | 243 +++++++++++++++++++- src/view/index/components/center.vue | 286 ++++++++++++++++++++++-- vite.config.js | 1 + 10 files changed, 585 insertions(+), 38 deletions(-) create mode 100644 src/assets/head_img/back.png diff --git a/src/api/index.js b/src/api/index.js index d9a36a2..133cd28 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -14,3 +14,8 @@ export const getArea = (data) => { export const getStreet = (data) => { return axios.get('city/get_street', { params: data }); } + +// 养殖基地 +export const getfarmCount = (data) => { + return axios.get('dataview.farm/farmCount ', { params: data }); +} \ No newline at end of file diff --git a/src/assets/head_img/back.png b/src/assets/head_img/back.png new file mode 100644 index 0000000000000000000000000000000000000000..e82e3131d62132661a24e532e94370cf2afbbe30 GIT binary patch literal 3983 zcmV;A4{-2_P)Px^Nl8RORCr$9TzgQI*A@TWU3M1)1eUjeplhl^4A6*)1|w>M+So?(Zu6*C)9GW{ zB<&w-EX(z|nt}Jp zpIN!wmiI|8?Xxmwoeojimo-Ti=dpleg$~#N@FHc=6P=F()c`A(fSp!mte)sNO7C;{ztq#Tk(xOrc#%)urIa3Bm79T0nIY+iJz5aGZa$5Aj?!6c~aT<>E7v%*S z42Uop5n(i9hMvivO-6L}+F)(#0CYOQX!7|YBiF1(_|heaT(c5}v@|U^JEjttNdrRM zpog>_U_~V5NJ}evx4(qJLq~-s=omvrd@L*}iLhj(BXY)!F}3#O$&;w8taSg~U<3>% zAUpzyhy-+c@wc$_bi{0Z6tUlXL<>xb1mhpAj0p~!=rdtJh$D1xY-hkGn%p@s0NX2X z!1n4J0*HCZ39!(=%-Jv+jRDEm+S-cUyLXS>*5m?)zzH)5V9Y=JA)@b-cc*JBy-?3g z+X9-;`7f40w${@!MHM5P=W%)!X29c z{yNDr@J=bZOP&R{^`U6tJmltNkGTlD-41JW3+h_i(9qq75d=7`!wwAg1NNb7gG9i@ zm<2ebEh(@3Nf0mR+$J$yQ7~pYK*@l)-2S@47qmrsxBnI4I)?R2@{q1!eJv`V*Vf`< za~m3aY$_oJ_SO4oH97(e4FUswfOFLUFtm;0lZEM?_0JtJWzPqfq<*H;KT*ewI|7+I zAV3r_h&Zp5JS$A8Ioybiw=YGs#y?OdtZT61lk+v`v5y2IL-1`#YkIo@F8TH);!Q{q zUqI6H&!~j!gl?sk8C>4)*i()Rh_X!xjJ5|h34g*8KNIT;mmw@H%wuHYfr_eg=p6o% zfY8oHTr*&kHO3nlGS}v0;m^dE{7RVTK)25|0U-j_Ln}^Jl+CQd9&USiQnyn+y*RB?o`>VW46w0)A&po@*e?8?K6 zN#0S2F&vDj)7RFYrbNX6afyi8@~H4?Ik>f+h0hrm5DOnJql22l8_RFV#LYJ?^5|Dq zc@k&ax~6Y|6Pc-_$(Lvo)5JlMwvK#aW}ChJ6AukhtO}XfrlrM*xH^dMtuKaNFP}2$ zIbTzY4?e4%h=|kMhlsYV(bFUopQOwdE`G|(e*))Hqr}4Vv{uIh5O3{Rd(#3exM7~U zkpBLD>^NKwiP-zA@Q_Kq-0Uf-ISGiAJy{AuabR0LGnFWfR6rC5j3QetYwkn*h#e1q z<4%vk-mmx=wcV2nH%vc_-h84D17>B3U{l(z*G0%cf^m+bB^p5N#JG1W4%mZ*1xQU! zRu|CO)s24~J2CwWn(T~p25N8g93?hE90V0D(Q=6Zg!~RY9KH0p;l`zi8?ob2FYS2y z;8Ao8UPtF^GQjk90bkhMBhZ#lpNr`GHzMh|-_q~*)iINZG6_H|+)h92CBLI(?LAnM znTlnLZ&nBRZ(SYUtNwg4B3<9U{s=ZX1Gn>4Sx7hyHE`2OABP^TFg z8NrLC?}NJnyn)Uia_uN&(9`J_%VmNUM-9NvI%e9$6wj2b3;7<4QWLOx*{y2Fx`qbq zKXX3h))%xuv~5}&JiDc4!kD`V83*>Lo-3Qn?IjF&y6?3&ai!#U*iev*tl1fA$D_wj z;9R@c*&t|XLZpMY_v-RVvd*6nhdw8aaVj8+tN!@fm57XtR9Eowz5^H>4UyCAWO23i z0R27gQCvKtm|u#jvANvw0t0_SA=D@CxeJWR?g^b}U)+CqvSNfz|KTB^tJN(Jg&UL7 zRDVPOV&TK(09(=e;AZH~RO9>Wi`5R~s=xNZvCvu2WF;8`5O?gAZT0{p@=O&TUB5=1 z_Ht(@-umd&WW@-b{@!OBm!*k&>c=oY^&@evVT#G6*hlI>AMU+FT+xcBv8fq*PoE8) z1xqB*QHHH$>-~ot*+d0isH#-OOlgwDRe3?3J&815?a8|yx|9^Ps z;{8Y8TBC+R#nov`mwM0xcm>k}k`ft#ht{rE*M97i<2ciyVdbwlDrpI3+`q#8g*P@f zV(+Ktv}c-~WOl0=kV{^w|>MuTW}g zYH;AQ|9Wp3x0M;L_{cM$;v$_;U0|?sC;M2Blq`dNHL>8~2-*5EsRR5m=DbCA5w#6N2KlEW4 zKJOj$bj*~qjN-bZ&FXo(o}A$~=PT5{{Xpc|up}Q@8SebFy@!sV@rz+^PgTzO7(DzT zI=21<=x&$O4wT0gZVP0>P;c{tyY4`Ec(^L&-*)Z6aF_{}Ciyf^K_ZsLd6piI2Is&4 zx8~f+M1qQ+xIw5dc0Bpg<6>~%D)+r~XJ;q=QBjG=b;a_P1aP*Vneto#BH8qIJpNM* zzIV_!D4RBC`fv5eTVarYFUr0Fc?(5kOgtw~pGIZVWp}!S>pH>(htLZV;pl zA=Uixb*ns5LU+A)5beXGn0@>(4C!fbg5^`{l`HBl-{(?}Y16V|z&mc>IwptI3WE@a z(nG&l=#BzX&f81x{tL$ZTqRo8SkJ;mzP)-cGnd=@7!X5;ywUnP-y5&^6ktYF5MqQ* z)5lg9!Wp6UUJk^-S_8*gjly73B~Wd+<~J$4;9 zjP|Pzb-QR&BUBAhtPOP%T4HVRC0ADrGB8oDe=AztraNy(jH{qPnAZAw?610@9_To@ zx?Mapgnm%8M9CV0zkAV?jIWHvS(KiN)wj4W+&Jghx&I*gBO)>T_#xn*m$>In{?a)!6v(-1lFNFDI!;)NNWw`H_2)2XAKEcJVUL-#E3})U>SJ}SW;lm-` zT0-u8+XI`J=4Tp-RNKV`~FB1j%?f{VB!j@L-Ia#HNn+iSf$t_b5yhh@#*gEBO z#!>mi`(8sC|NK?p@_1-?3x|J^*6rD7R{ES&xlAr5gT4`RoaoqFqDGV5l zDj0OUmteeRp8J@j>b)3k;Sg!cm2J<;oZ>I(o;s78PX#@Za>?nGK9Um_^GqziIUlha zv#QL|($ejgd<{u|ct&Ujhal0cK&q?8)evPOO1q+3HZsTd^B0AWBK7t9PrBD` zBTB1w6%9@b7>6ARCOwLlEJk{Iy5FJxbFl_x7cRkcYXMST{-eSf0cpm#r0Q=*xm;Z; zWnh`k{(b?9sK=#nfxo&H?I5Hz0-Pv->TJRc*T%IQim7SM5ub_X(F6!yxOMao8T7^6AglW@c-Ul!#K-`4u*dzmk7zLPt-TOdS z8&u^jwiB6Z0){Fo2`uNRC}7;OWy_d2(1EPEy&ZM!U8w8q#*p11YF;94S&W#+ALE9! zG?)AYguWz@BE#`OpAtYc-0~!VClz4m_hga83lUC!s=g3GD^ypz5P*S0RF4gs^s%1_a^>-Y9Pm-$J1A7CzSBrwkBf0y#~5gx(oKM@rWV zROG*sWm4V}L0Qv6d&E{dEh67x8MDOCrfhm`hWvUA0z&(^K%jEd(y0VOnPbWU@kZX2 zHcnhaFIDk8Yy|i7i?@E*;+bU?JT$#0z*6~|E>oO$%>9s10`ivVWj pfH;mbpxOzYs6&|wUI+%5{{h@0uo>|*`kgtG?ERg$=REJvIXx-|5leuTz-r(m;5guDU>UFo=mquz zJAo&GZRP)4fd2y?2JQzQEZ+{yW)nRJfvCB_VZd{NUjkl8i0Z59I||$d{15O5u)Xvf zCI@l|unTwyxDWUNu(#U{)h*mDP66Hsyb?Hkntqa#UqraqPd2?CxRY>8;27Wta!`AK zjlg6#8#)-AdNuGjWwW!vK0@4gfPVwN4m=8s1M>*yCc2q$HbnIj4)*~A!1I7V1)ksS zL~XDh_$qKC5y7!;CzuIQ{Y2IWfyG4jmjcUyQwcH0l|Ba(qrg7{e@hI9TOqTG)Go66riXha2rz@fyz98HYOF--5<>L7_e-T>TQ z*I_m$y&srgHZww$cN=k(6Erw9!BnT&Lpan|<`@Ky2hIS_22KYSbg_@`0T+?zWC{+3 z^L-}hAqO-wv9OzjQVfb#1P?P@OZ&@pY|FU9MiBex(cJ@n>ah zSJtnNpx;%$te)5M?O+f&M_r}9U)?qX!nUa|Z(e&g0qw5VEZG#;?_l?dUXXTEBX(dRGT- z?NcvP2UL2yJjF_}D{KM24eTZsZ542C=~rPn3AN_8{5}(m1D^-}0Ql}S{pJ!Qvkbb+ zrv`{<+yNX#61-25RN=Y6`-w>YHX-l-Q1&s}jVK(c zzNv`c7u4TV=a+B2>bqJ*;z@PAu}&*yA$qN?SG_{rF^w3mQI~YXslC9Fz=h@SBZve3 zD5)*n3j93qv%n95dx6`4o4R94TTBA~Q0Bk9O`p?&BWI(yA5$k=PG@2HexiDz`ohxp zVEM4-c9MEu8%}LgFY0Epl}6kyQy*)ZXp{Qt9}@x7iQ#w~!roV<=AEzaO|Br}&D(&xX(V^AEClTaK1A}P6L~sU+KF*hv{^|kZQh-Emv=?QO;Y7A!%0T5%qla7WHvE z*E#l=ez%lyBTf5gXD}|SnRl|4s7dt^6ZQ6%HqbQrON~Qq#f|E+(q}+DNBz1}O@AE@ zwCS_gWC1UphNvF(IVSd;f?i-PQ9OxE9|in1iMlPKP-Uwwn) z>q_4Rz-iQ{+>ez-P9+xU5>n)^4(TPp>q)@dy!K!rY%TCOv7#?8{f{E<;;QoR)jYjg zySuD?8VPC(xw^Elb4Wc+{g82}s$XjotLLcyRU<0<)vHRMLyUuN)`cE*p1NB7V$0ZZ z^(iCrA2H>xKJ^5XB#xGTPpKcUCBrod>l&x()o#@PP~WB=RXWaB&sJ|T@_s}4{T1ql z8looEciUd}o7-~rb2W2l3YHJ5f36;HGT9fY|5CnhRo~n)U!VF%POV99t_;PKrciig zSs25ix2yN4ziFcI$J=b^Q^s1=5i-w4Y>4`7b#0q@EE~L2{SCwABMYIb52>d%%{8a& zac9%`?_pS5;R*FN^`fRhzpTDj{ZC_+>M*Llp@yKB8F60K^81;_eN2Z@^^es-b%FXP z<@Zn95br+q9Zu!c=dqzb&G>=(m+En4@Y(ABcG$!^^%~=2E-mBlRlj3SyVV@O-Wqe< zg6--D3sLjckE#PBNgG&0|+;Fa$F zRa3uq*r{Gy<~Y{afHj6&{pxi#BxtMp8q~wpGfaWwjp|>R2%$0x50u5%8E4rI?ye3iVF|Hxp-a@Wm_L1=BUrDI*Pb8v$JBdo_Fa%sc zvWX4lx65dRPEJs92hiKt`1}BhmGH= zIQCNG^hb>WnJjIux<&nJQ~$y8_k=CQ%<9(TG;$k$LI*C?VF$^D?k2YoUuyccxSZ^- zPBZ=;Bmk~T)k{ep_dKGUET)u}ZEUBqDG%jqI~Z)W%7W zTHQBUT9p`%lA`AI)Zd_Yx+^+~#(N2fh+bdX(x%^3f0qNehU80ofX@-dA1Z`TltX^9^xZ(x{jqW=^GPA-t)#ww9x*x%s+)*vMQ>ST zpb)x}JOWukDz!@pcdGXk^Ge%GPXBh`j(mB@27gyXPH!_le3+)@xI|=;}j_-{Yn!Ax2vSi1e5B+#&Hjs z6lB6AkaKJHj<&xZ?KN5OolYO`turOyh2}5@P4w~I4&!Eu^(IO{{e5+}iA@h_N6>Uc zRfMfF0pmo=Vw378&8=Z|5pcZvcV*#&LD1bMrBl2@HUa;2Ng_b0lX_ZdConM;a{$C5z!c;c9s z5@$V+9NGkN$U8`su#qH=4-gLRBGE)OZYOcx8~G_d;f8Q&n26^{X+wml1B9rZM0Cdp nff7eNT-s#$zMU>atq%VWq)invGQ|~<00000NkvXXu0mjfp7W}) literal 3983 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 pfH;mbpxOzYs6&|wUI+%5{{h@0uo>| { } defineExpose({ - open, close, show + open, close, show, choseTownFn }) const addressRef = ref(null); diff --git a/src/components/headView.vue b/src/components/headView.vue index 1d17430..e75844b 100644 --- a/src/components/headView.vue +++ b/src/components/headView.vue @@ -8,6 +8,7 @@ import axios from "axios"; import { getStreet } from "@/api/index.js"; import { useAppStore } from "@/store/app.js"; import { useUserStore } from "@/store/user.js"; +import { sendMsg } from "@/api/sendMsg.js" const appStore = useAppStore(); const userSotre = useUserStore(); @@ -16,6 +17,7 @@ const reload = inject('reload'); const info = reactive({ address: '泸县', + areaName: '泸县', pinyin: 'luxian' }) @@ -34,8 +36,21 @@ const offAreaList = (e) => { } }) info.address = e.name; - mitt.emit('map_info', info); - reload(); + // mitt.emit('map_info', info); + // reload(); + if(route.query.type=='main') { + sendMsg({ channel: 'user-breed-datav', event: 'changMap', data: { + areaName: info.areaName, + name: e.name + }}) + } else { + router.push({ + path: '/delivery', + query: { + name: e.name + } + }) + } } const router = useRouter() @@ -43,7 +58,13 @@ const route = useRoute() const navToDelivery = () => { if (route.path == '/') router.push('/delivery'); - else router.back(); + else { + appStore.setAddress({ + areaCode: appStore.address.areaCode, + streetCode: '' + }) + router.push('/?areaCode='+appStore.address.areaCode); + } } let nowTime = ref([]); @@ -82,6 +103,7 @@ const initList = async () => { let area = appStore.area; if (userSotre.userInfo.street_code) { let data = street.find(item => item.code == appStore.address.streetCode); + info.areaName = data?.name; info.address = data?.name; list.value = []; appStore.setAddress({ @@ -90,8 +112,10 @@ const initList = async () => { }) } else { let data = area.find(item => item.code == appStore.address.areaCode); + info.areaName = data?.name; info.address = data?.name; - list.value = [data, ...street]; + // list.value = [data, ...street]; + list.value = street; if (appStore.address.streetCode) { data = street.find(item => item.code == appStore.address.streetCode); info.address = data?.name; @@ -121,6 +145,12 @@ const changeTime = (e) => { } onMounted(() => { + if (route.query.areaCode) { + appStore.setAddress({ + areaCode: route.query.areaCode, + streetCode: route.query.streetCode || "", + }); + } initList(); // 每秒钟更新一次时间 @@ -130,13 +160,15 @@ onMounted(() => { mitt.on('changMap', (e)=>{ - if(e.areaName==info.pinyin){ - router.push({ - path: '/delivery', - query: { - name: e.name - } - }) + if(e.areaName==info.areaName){ + let c = list.value.find(item=>item.name==e.name); + if(c) areaListRef.value.choseTownFn(c); + // router.push({ + // path: '/delivery', + // query: { + // name: e.name + // } + // }) } }) }) @@ -147,7 +179,7 @@ onMounted(() => {
@@ -155,7 +187,7 @@ onMounted(() => {
{{ nowTime[1] }}
-
吟龙养殖溯源系统可视化大屏
+
吟龙养殖溯源系统可视化大屏
@@ -211,7 +243,16 @@ onMounted(() => { font-family: "ifonts", sans-serif; font-size: 2rem; height: 100%; - line-height: 50rpx; + display: flex; + align-items: center; + .logo{ + height: 2.5rem; + width: 2.5rem; + } + span{ + padding-bottom: 0.5rem; + padding-left: 0.5rem; + } } .left { align-self: flex-end; diff --git a/src/layout/index.vue b/src/layout/index.vue index 01b8227..2d4249a 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -2,6 +2,7 @@ import headView from "@/components/headView.vue"; import Businesses from "@/components/Businesses.vue"; import { ref, nextTick, provide, onMounted, onUnmounted } from "vue"; +import mitt from "@/utils/mitt"; const show = ref(true); const reload = () => { @@ -23,10 +24,13 @@ const startReLoad = () => { } onMounted(() => { - startReLoad(); - window.addEventListener('mousemove', startReLoad); - window.addEventListener('keypress', startReLoad); - window.addEventListener('click', startReLoad); + mitt.on('map_info', e => { + reload(); + startReLoad(); + window.addEventListener('mousemove', startReLoad); + window.addEventListener('keypress', startReLoad); + window.addEventListener('click', startReLoad); + }) }) onUnmounted(() => { @@ -40,7 +44,7 @@ onUnmounted(() => {