From 406f5ad9add0fb3eeeed0271cc0c46342cc475d2 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 2 Feb 2024 10:10:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E4=BF=AE=E6=94=B9,=E5=92=8C?= =?UTF-8?q?=E7=BE=8E=E7=A7=BB=E9=A3=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/weather/PM.png | Bin 1354 -> 0 bytes src/assets/images/weather/gz.png | Bin 0 -> 1453 bytes src/assets/images/weather/index0.png | Bin 4510 -> 0 bytes src/assets/images/weather/kqsd.png | Bin 0 -> 1667 bytes src/assets/images/weather/kqwd.png | Bin 0 -> 1728 bytes src/assets/images/weather/line.png | Bin 0 -> 1757 bytes src/assets/images/weather/temperature.png | Bin 1476 -> 0 bytes src/assets/images/weather/trsd.png | Bin 0 -> 1172 bytes src/assets/images/weather/trwd.png | Bin 0 -> 921 bytes src/assets/images/weather/windPower.png | Bin 841 -> 0 bytes src/assets/images/weather/yu.png | Bin 0 -> 853 bytes src/views/next/layout/screen-header.vue | 45 ++++-- .../screen-content-right/home-right/index.vue | 131 +++++++++--------- 13 files changed, 97 insertions(+), 79 deletions(-) delete mode 100644 src/assets/images/weather/PM.png create mode 100644 src/assets/images/weather/gz.png delete mode 100644 src/assets/images/weather/index0.png create mode 100644 src/assets/images/weather/kqsd.png create mode 100644 src/assets/images/weather/kqwd.png create mode 100644 src/assets/images/weather/line.png delete mode 100644 src/assets/images/weather/temperature.png create mode 100644 src/assets/images/weather/trsd.png create mode 100644 src/assets/images/weather/trwd.png delete mode 100644 src/assets/images/weather/windPower.png create mode 100644 src/assets/images/weather/yu.png diff --git a/src/assets/images/weather/PM.png b/src/assets/images/weather/PM.png deleted file mode 100644 index 3fb62ba7c0685304cb76e1daa85fe4398a45eb9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1354 zcmV-Q1-1H#P)Px)1W80eR7gw3mThd7WK$7^XaSwuoCICs zHr)rK*<50_#W`@gIXBMX=lsvP&dYVgG?AtWm+1$#eG%|Ha0Iws(%z}uhV5SicL5RDAn9il z>7R<&_G`eEgThZrx^qa;_N~Ag;4R=mNvZKuWc#zgj!{506FEN|c)j7Lsj}ePk~XH_ zw!dL`?vxYo{X}|f6!5i%mxl8MUy!u@bWxAUvF)pYoTN1R0_F3**RWyeU+`3t=#Ejq z<Ya)c!%{X<&34h@KAL6f3(>;Iv6#hkrS9R9 zhkAV<@B^7wwv@2;1}Q%k2gVGL1Ks{|Nch``3Nd3lNc zI_$i(vxntTbXJxsZNV`#2Dqc!3yZ|A;gTVet(dJ3hx7Iya}%Zk=!~Xr-kItgtcT)H z|HC_&3k&k*$5m(Q7o(BK9hv{?_76`StS_{2ge`d8_%DuuBqg1?;+2TX+cyM^u#?2=IDV*1E+#*2VI*$ zZ8YUh=uw{i<*=ioLdPa@W>>e*PWoxE`6zpi{xYc?@9g&6*vlP=n*}w3V~C@MS(q}Q z$FNmqV_gNCCezog2VAyjl(Qpp{NBI)O~IpxE{Uh}kw53EXkRJ~G~1byE*9qVEF-cG zxY%Zg0(UQ|)a&C#wbw2_vY*?7*kD*&U!|AF^l|e(uaMcCK551C`1vBKf1>N${;@B0 z!Y>OBz&43L=1of?4o6chaVe2&6*xPXXY%6irSsG?2KddrE-uaRxi40a-*=~TVq1q- z*?b4M2vJGe+os=QR|1>E44z(Esohg5uBlWrwzhr3S^a&Sk%=6>I6HFEO$fYokI!@D zl5`#^NBi=uwr|<(Y(~^Ct5IXBy!At0ZPB^BhUVAz@Ra}+Jvkaz*Pa|8DgFH;m-h{@ zvM@dZU02rp@0lHQ)hXk(-Tsy%PZ>4~u5#pd5-MaKLVPLqvnOQOhxo0`8;DzNiVR_8 zR+kMKef0xho`^rCCNT$BWR<331dXWbrZ(RsaeqUt7QE8t-zjh`Ms_0Zlh|n3E!bew zxT;pSrIwo7-5_|jVWFyqEWiALSBJ|I#Mr@w^$J19h-B$wutXGwz5&;{QMEF_~#|`)wQrj3GWZ& ziJ63+AU;oI)6s*>x@FnPjbvQl7g~ICG!NdmMCT3(Jomo8N8~b#$AL45tWZEi_Bimc zOb(bq5sS(3_KEd#efm}!egXsnPuzH+e)Ruqrz!PbVUwL6nl|A70Px)XGugsR7gvumThd+XBozS*YiK8r=>lmNh5QgZjxw}xaVV=$DMZB8?K7ni!N+nVRb|#-)gNU7QR$ zX*af=r!lk<{5GCDmvLZp>ftVodu^0=12|(ycO2zm=0;>eACXCv#KMCPwkMc^f$k~kHaLQ+7@3P5DdOXdsE6Y(6INQj; zFO<2?;{5@RHs|^4`7xG;9Ghi#8Wsy0fdq(#GH_n_ITL=~n&#7ix9 z3U>kxvnZKpaad9J&uil4>7u;iRZni7KJ8|;a&NG|ZD^kb=%h;(`&knnT-2h$T5&ZQ z50t!$;HL#0Px03Sw+lTKO=+J-{Gz6A7A)i(_69*XJD)NQE1D3x9SFGJy2g;Paw=gH% zx3b8&BSS1#M1#?Kvfb5f*bPM*@a zDsu}dUj^>8SS(NcO4H4V?AzNHB0I;RuOXq$X6)nF>g^dj*Yw4`$2@;d!j~efSHe>Z zm-Fm!Kh5QoPsGUWz&b$_A_t^qVh}hX^Gs;unezu3EUsle30o0;xxiyLFXzx@B zDY4U#7yPm^PWR_J^j6I`{`GM$4OMz%It;HU;h`fdInX_Art0Z+L%D&*N{;ef*DyYn zO;$F)eT|hdvJ<#j;vbHD{(sA~5t-E{*nIJRor|@aH7qo-eGeJ!#Zc$Mv56fARk(-R@F7LZlIw00000NkvXX Hu0mjfWV+c? literal 0 HcmV?d00001 diff --git a/src/assets/images/weather/index0.png b/src/assets/images/weather/index0.png deleted file mode 100644 index a3d7df9722b3d75b25246d3033dee01104b3f779..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4510 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 diff --git a/src/assets/images/weather/kqsd.png b/src/assets/images/weather/kqsd.png new file mode 100644 index 0000000000000000000000000000000000000000..d87ea6c85ee76e908cb4f87be2f911e553622f4f GIT binary patch literal 1667 zcmV-}27LL6P)Px*JxN4CR9Hu?S8H&T)fs-Cv)#=SNXSiuq=BLdAz+|rfPy#U4CRDO3Jf+o4{H78r4co8Z6zg*t_d3Mh-D34#HmK*s>t4I%F3`=0jO zWOu)8cC#C&=ihhE`#$G6&wKgKA%;0FOU2%pHcOb|A)gxM<=%WDx+7XAX>riU+p5W4 zw;%HbN!SG=);k0r?*G1OS-iD$1kdHd2}N}Wqz~hE;>*PaT=Tt&gkriMwzdxdAomt| zdG}C6+9iK^Q~?0Bjvavr!P%pH{4C*@w<4jCDlkF;2;&BC$|s9`{A)Hcp|D;8^+K8g z$J@O8Nh2BUCzngqzV%SVdIzbHq&sy*W1LoA$d2@dkW|O0P73f2+KF0S?DhOHZz5O2 zu_h1ARu@nZfFtXjE@}4_`OKn0M8ei9AfL~4Tmr|6e5NrkA|a`qF$E-4Ccp$eZMlj=z$LJ@riVp1BJV1bv7e)7zaL_$)971jwb6%rV(F7+~=T#3;mjf+Hd5RAov5$0y)g&tw5)wTyY^*3?Yi8QOx7Y2R0G7B^ z*;nqz;!MOdVGJU2v0FD7qZ4v9E*d^}V4*V{T(<@+V!($=Y2hWaRBB%qyFSYKPq@NkGYwqIP)3y@xNsq$8BIUgGeC#gtF zr}cY^zey3%GgEHxtaC~(cp1)be!he;fPLOW^IlyAKgk9h=u)XSrVa=r<2J;l$>ppj z8OxchflKyo68H8SMi667Llrv$m+W06?n?&{u)`+T(#B~+&_ZmwN2bn(d2{+$_I&;y zd%J-96MlxQojRtkiw+r@;}`7{1g7<$pnb+zbJNjt8t3urJe1)Vo^&TAHATb zB>mZyClAc5;*Oj|nmgjn=$81QfVR2SoP6YK-9=&lu!snU=ZxpPBVXy4BwkJC9I;^T z4|yObk$;`nZYh}~!7d*v%Po{z7TS^Nc9k9R?K>v$k$;}kpA7Jegqg>K+PT$v`>{)?c^r+htRE?fq75B#^vXlKAwKNof2XY3EI3 zi{vS2#itM&Tu$E@;=v{LYkj5W4}C4gjVTZaAIx5`^m@#*(O(P&8-*C#PEQt7Xe_-(wu#tWVA@0X5jb zHUT&1s+Iv{ohDDbxV(Wc4%08Y`RhkiRyYc4B&-Db|D;*W8E?q=*ap@-JUw?#q{HO( z2!H#8#u&tJUH8exED)oeQf6Ppw1PN9gPkj;@z`)wNK^9ry8eIt{tF9^XF)SyCBOgx literal 0 HcmV?d00001 diff --git a/src/assets/images/weather/kqwd.png b/src/assets/images/weather/kqwd.png new file mode 100644 index 0000000000000000000000000000000000000000..f51cd1d76ca799e72fb6fef6c035691c0af86bc4 GIT binary patch literal 1728 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/weather/temperature.png b/src/assets/images/weather/temperature.png deleted file mode 100644 index fc68ab13aae7b7b4d809338e26e9e4a683012e82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1476 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/weather/windPower.png b/src/assets/images/weather/windPower.png deleted file mode 100644 index 4c3163f740268a215594be2b7ad3f2d05c2d10bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 841 zcmV-P1GfB$P)Px&14%?dR7gwZm0xI9br{D#-*b+8k2>2HB@1ezu!YgeRALu`P(gt(2t{WXDj4(+ zqKoP(BBiLPn;^(8DpC*%7a7t;UI+$J7tM-rvWb}kYfIA2xxM=CoUfeOY_EHBuW#>* zg1^h(`8~hS^L?J@e1GCPEnO!rH$K>QC-5q8FE9ao1-vNfWF=KAOR?=uz^DHJjss0V z18@{rA!+1V;pKt{4NZb4B<-=?2z+4ZGQ1N?FV_T|B!0!__bAe?DS+*U)cl3%3qxh) zpIqn8`Hnc|8H-gwVDocQ;QcsO|McX_Qd~-n?Pwz9jA5WI)Y9zC1^Ypz?6bN3ikN%? z&(4kX$<%(u;QR$YZ}A@D1&4MD#e}$)@=_l*ODL_vQfJ4rA`Gmj=khGh{K+7;8xpcxc$IQI575iW8iM z6kK4!5vf4AfWcdGI&x)_w&zGHluG{8mJCD>yhf>PKw$1D`i9(1x0W zZHFg@c_AXNi@H{e?%XrJs%1uKj&34biVlVg%*9hJ+9zaMZP z&{_erIK*Vn=Jt-3e|@>+@J($VJmD^-bV|&c?Tm|rZ0ZCJHmiZU)I7auErcU3 Tte#F~00000NkvXXu0mjft5A{A diff --git a/src/assets/images/weather/yu.png b/src/assets/images/weather/yu.png new file mode 100644 index 0000000000000000000000000000000000000000..a219a8e6a165e44e5eb7eb5c0c16feaea7aa1792 GIT binary patch literal 853 zcmV-b1FHOqP)Px&4@pEpR7gw3mQQF@R~W_5xo>7jngq30TVe_ZTT3*5ByC!7H?dGs5DMv#qJ>y1 z=t{dySJOoW7h)BmXw#w+jixEI5e(8mTBvlBqLXPcBnw5`5ZeUJq?sf`-aU0DLGtG% zGx;~Y%lFRr{qDKa- zY)l88@qfetgLwh|<`t6`JUp!DnWG4Zq9s75q(Z+l$*R0O_Roz?3yvk+Mt~nL89E(6 zu(=?>eM`jR!g%Qb4ecAlfhzs z;rU1;KX&%1Xwu+K058(6@R%7q0nqC_!0lj=lNmpYt6_Da9BDg{wSs$s!;&e#i*^aW z*6w833;sio3S5huR=D#1PM-DBd>2s>d}xEkiP|z=OS{yqf9R+zP6Id>D&rBaq~At$ z96-a&j3;Qj3C{x>W;<8zheHuizOkw@r6+5Wv^42z^+|Rxi!v zNa{9hfUsx(E_Tk<%-iE|r+iyCp!)vz=m>{ty^@~ml0V1b?fOc#FI0RjU0OG0P*q>a f4lm9BR@MIjLJJH5!uZ&t00000NkvXXu0mjfwB(G+ literal 0 HcmV?d00001 diff --git a/src/views/next/layout/screen-header.vue b/src/views/next/layout/screen-header.vue index 0fa69db..3c29443 100644 --- a/src/views/next/layout/screen-header.vue +++ b/src/views/next/layout/screen-header.vue @@ -1,10 +1,20 @@ @@ -34,9 +44,9 @@ export default { }, methods: { ...mapActions({ - set_nav: 'SET_NAV', + set_nav: 'SET_NAV', - }), + }), computeCurrentTime() { let year = new Intl.DateTimeFormat('zh-CN-u-ca-chinese', { dateStyle: 'full' }).format(new Date()); this.showYearZh = '农历' + year.match(/年(.+)星期/)[1]; @@ -44,11 +54,11 @@ export default { this.showWeek = this.$moment().format("dddd"); this.showTime = this.$moment().format("LT"); }, - handelClearMap(){ - if(this.navId == 'whyf'){ + handelClearMap() { + if (this.navId == 'whyf') { this.set_nav('sy') - }else{ - this.$EventBus.$emit('switcMapType','Emap') + } else { + this.$EventBus.$emit('switcMapType', 'Emap') } }, @@ -74,14 +84,26 @@ export default { box-sizing: border-box; color: #ACBBD4; cursor: pointer; + .left, .right { - padding: 8px 0 0 0; box-sizing: border-box; position: relative; + + } + .left{ top: -4px; + >*{ + margin-right: 16px; + } + } + .right{ + top: 2px; + >*{ + + margin-left: 16px; + } } - .center { height: 100%; display: flex; @@ -107,4 +129,5 @@ export default { letter-spacing: 2px; } } -} +} + diff --git a/src/views/next/screen-content-right/home-right/index.vue b/src/views/next/screen-content-right/home-right/index.vue index 933e7ac..b318d01 100644 --- a/src/views/next/screen-content-right/home-right/index.vue +++ b/src/views/next/screen-content-right/home-right/index.vue @@ -6,14 +6,14 @@
- -
12°
-
- 多云 - 4/12°C +
+ +
12° 空气温度
-
- 良 + +
+ +
12° 空气湿度
@@ -42,7 +42,7 @@
- {{item.title}} + {{ item.title }}
@@ -55,19 +55,24 @@ export default { return { weatherList: [ { - units: '温度', - img: require('@/assets/images/weather/temperature.png'), - value: '20~30°' + units: '雨量', + img: require('@/assets/images/weather/yu.png'), + value: '20~30mm' }, { - units: '风力', - img: require('@/assets/images/weather/windPower.png'), - value: '3~4级' + units: '光照', + img: require('@/assets/images/weather/gz.png'), + value: '18.8lux' }, { - units: 'PM2.5', - img: require('@/assets/images/weather/PM.png'), - value: '21~46μg' + units: '土壤温度', + img: require('@/assets/images/weather/trwd.png'), + value: '15~21°C' + }, + { + units: '土壤湿度', + img: require('@/assets/images/weather/trsd.png'), + value: '52°C' } ], videoStatus: '', @@ -78,7 +83,7 @@ export default { { imgSrc: require('@/assets/images/resource/whyf/3.jpg'), title: '金吉友拳法' }, { imgSrc: require('@/assets/images/resource/whyf/4.jpg'), title: '张院簸箕制作技艺' }, { imgSrc: require('@/assets/images/resource/whyf/5.jpg'), title: '毛子埠升制作技艺' }, - { imgSrc: require('@/assets/images/resource/whyf/6.jpg'), title: '上铂金银器打造工艺' } + { imgSrc: require('@/assets/images/resource/whyf/6.jpg'), title: '上铂金银器打造工艺' } ] }; @@ -116,75 +121,64 @@ export default { >.top { display: flex; - align-items: center; margin-right: 9px; + justify-content: space-between; + padding: 0 20px; + position: relative; + >.item { + @include flex(); + align-items: center; - img { - width: 70px; - height: 70px; - } - - >:nth-child(2) { - text-shadow: 0 0 10px; - font-size: 48px; - margin-right: 25px; - - } - - >:nth-child(3) { - height: 100%; - @include flex(column); - justify-content: space-evenly; - color: #BDCEEA; - - - } - - >:nth-child(4) { - padding: 4px 16px 4px 23px; - height: 22px; - box-sizing: border-box; - background: #31609f; - border-radius: 11px; - font-size: 14px; - color: #ACBBD4; - line-height: 14px; - position: relative; - top: -15px; - - &::after { - content: ''; - position: absolute; - left: 10px; - top: 7px; - width: 8px; - height: 8px; - border-radius: 50%; - background: #E3FFFF; + img { + width: 34px; + height: 34px; + margin-right: 12px; } - } + >div { + width: 100%; + height: 100%; + @include flex(column); + justify-content: space-evenly; + :nth-child(1) { + text-shadow: 0 0 10px; + font-size: 22px; + font-weight: bold; + font-family: pangmenzhengdao; + letter-spacing: 4px; + } + + :nth-child(2) { + color: #BDCEEA; + // margin-top: 12px; + } + } + } } >.bto { - margin-top: 16px; + margin-top: 20px; display: flex; justify-content: space-around; >.item { - width: 120px; - height: 100px; + width: 90px; + height: 106px; background: url('~@/assets/images/common/weather-card.png') no-repeat; background-size: 100% 100%; @include flex(column); align-items: center; + justify-content: space-between; + font-size: 14px; + padding-bottom: 5px; + box-sizing: border-box; img { width: 30px; height: 30px; - margin: 12px 0; + margin-top: 15px; } :nth-child(3) { @@ -205,6 +199,7 @@ export default { box-sizing: border-box; display: flex; flex-wrap: wrap; + .item { width: 140px; height: 108px; @@ -216,6 +211,7 @@ export default { color: #BDCEEA; font-size: 12px; align-items: center; + img { width: 130px; height: 80px; @@ -224,5 +220,4 @@ export default { } -} - +}