From 86e1653af445abffa125673e475ff33699445b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E8=B6=85?= <943480861@qq.com> Date: Sun, 21 May 2023 18:29:56 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BB=BF=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/imgs/show/icon_select.png | Bin 0 -> 3048 bytes src/assets/imgs/show/icon_timing_fault.png | Bin 0 -> 1472 bytes .../imgs/show/icon_timing_killvirus.png | Bin 0 -> 1675 bytes src/router-demo.ts | 9 - src/router.ts | 26 +- src/styles/framework/base/flexbox.scss | 49 +++- src/view/tabs/device-control.vue | 75 +++--- src/view/tabs/fixed-time.vue | 17 +- src/view/timing/timing-add.vue | 48 +++- src/view/timing/timing-select-device.vue | 249 ++++++++++++++++++ src/view/timing/timing-select-time.vue | 43 +++ src/view/timing/timing-sure-delete.vue | 58 ++-- 12 files changed, 454 insertions(+), 120 deletions(-) create mode 100644 src/assets/imgs/show/icon_select.png create mode 100644 src/assets/imgs/show/icon_timing_fault.png create mode 100644 src/assets/imgs/show/icon_timing_killvirus.png create mode 100644 src/view/timing/timing-select-device.vue create mode 100644 src/view/timing/timing-select-time.vue diff --git a/src/assets/imgs/show/icon_select.png b/src/assets/imgs/show/icon_select.png new file mode 100644 index 0000000000000000000000000000000000000000..b010a9e372dcb3d5af7c9c8b50b3453e718c43dd GIT binary patch literal 3048 zcmVP)Px=qDe$SRCr$PoqKRp)g8ybzq^|R1EJ6a&2H54h(=JHq3TShl2B6r(Z8e}>CiT< zQh8~$GtRJ~44uZ2QnHjcg4iiiLyNpoL0hDOWP^PG>Qt(e4o2%VyRo&yE|DN{_nyw# z%|d`Y?#(&(?zxw{|KyLH$M5(1+~2+D@jK^7@P4kg0J&N_PdRviUH%YwfIYx2w}8vl z^E}uC>~agZTs_Z&J-{xvfXmhMJlF&5atpXzJ*uup*ZJ3%-Tc2~a11P6osY>@)*f3DinJYjt6u zwXTkIXJ|gKl#ce`>9w)jlhCWdsG5OI1H))3PzYxT)C6LUerSzH>I46f(rykKaU9_4 zC7(=4b|-6ePz@LxZ;Q={+BC2Rf4;w=ap?^o*wUw@P8bu2&D6?+&!t!>_F)c8bg0O|vUfvvmhsM}~Y zyUQsHxT-ex16|jb0VuQEC?@-B*EDT$bA8}Nll5#Vt{mWREbh1?nbbFeu}WJkAgdFi zh~KY0c63?kDOpX*Xh#{qb2qcR_fK~$1+k|XV}2RR+1&;aCBbOb#PZT5&(EVT?C!s> z{*(Y*wWMPlyP)r2VE3qC6j2!nblm5onMaogJ`!z9w0_P3Pg@k7p{LjumRXQ+&5wY% z=A+q7%Y*xJsZ>q@S1pV#(ZQa{r2(w&TLb;9c|~xk)&2C>eog@MWyL>rb*yDf|8cGq zx3ga&ZNoPUOMjA!0}vTzAKbU>Tf%BK|0cwa zHRTuh%VnLQkOsIa)Ly4E{9HvaGGv<61DC&&2l}np6UQrm74u?^@N{#ytWJj9(g05l zML%%s;A+xMc~~{4IQ_jH?6>uBCw_B?A6yjp5w*31gA)W=xL8#R;B>J17pZq;2&7sY z6FJ;Ri!tK5!Qpb*m+y)Te}{QH{yg7g8OxVa09V$wKf!dYQw@%&Jh$DLht+e8!|m+S z@$F@w;Cwd|?HZ)v$w+F~%Mg6-K4{6+Li^40>*g4?wn^LDQ+vrKmwf z`y=7t4AI7f0rv#beJbtnwWvlC>Q|KIVfEZ%n1Q?Wr8o}1b6!I4JxvhK+*cSZ5e?82 z23!@2PShEDPo8GEZRyssJgk{hjG{tg-(2pwzt|DS8*fX5+hYQaXi{@H_`ZlmgaKEE zq7O30a(X;N!~nhP-V*daQWf}hkM8ZxLhtGnh^;H_lxK!40vj&y%r41MTAhH zE{D5jZV5&j^jr>i+0Hor_?CRn?KQ_))DkYM7qO2p;L1?@7RK<1h!DB1TOROZ?L5Wc zrac%hM8ajWMeHLC*y)iQ6FA(tC0DI2_h(e@xxd^M#~)5w=(*X>iG(9PgaKEEqJL+M zO%{2|2CAFy2a+j37oS>Q)y;&`jOSjtaWD|v`rUE7cESd@nQ!pBk#O)%5!=cD{2^m( ztcVbO)txdSAM@`Y3BK6Cf2Tg~#tVl!apJU``%cEE;TB`maGxR38Dr^HD!btJ46;6o zgoEP@3D{2|34q%_Wemk4LR?vQ`klk@^!G;dC-|~|aU-wXm%z(^5nIe3cY`16=9`0C zzgv7O(5#J!@V`j7ti)`+-sOb>PYtzS07Jfr5WVXb77%tUy1rk};*fu}H!L7~` zs($_C7(@2qkd1sBzrx|pE5?_LjK7v;eCrJVKI`ex zEuXp^?|bTU^B6zY&o>U2+k55SIQ9z;`~IAR0aag5gc=JS)+|+ut}xv+#)ozDN>DP=*lU^FclG`R_P%*ehVw~j zLy@IQ>oyyPx<>ro$K6;r-yGaE`xDrs5Zv?=LQr9|!P@P@p+G)+UN^i##qGHEt9V^XGBf7P$guC z8?w@-pgXg%QUgKWa3Fyl&5FX!>?ElXbe9HfW7w?OXve-FKYJj7mlTGZ9$%>xHfwj_ zyV-c<-jFvQOkjJHx}KYrHBZy-kde+uc(WlZkljaD%$_*la&9_!7Qb)$%*f|Cw`Ej2 zy27oIi^FGT&I~>G+FAVWr~}}pN6!i#KFihdQ6rEyzkU|mjyMA@cNQg&k7h>Gxj6vN zk9My7(bZ>&_(sI$*E=2KxtR?HMGt^yM$@^w!XYr)hnngU_}Xp5z@tL=a^;JSpW&T0 zIWb&zeUz2H!ojk?yKoH{LR-vHq8K}Q}gF2FO9 zx-zvLXXYiRba`^hi%XeadRg1vQI;)q45WdVAlf#*$O+(UY2an&fU2*@CZ~Y8Kzs_N zr`Q&^C9mZ3T+K(b?Z_}X(EA|gfG;hE=sVn!#FDR2QGxayt22uldC@BYI6L_2IM?wE zh&|=he20AF0E|{mEH7PRWkyjWV6$bE0h|>m9YmkhH##owAyLHd*B+B`OS>6>gOybd z@WlaGCTL)p15)I*Ynry$ioAn^!87uIWdUEBGshkVP^(CJ z%P0*vs|1hM>^K>l1;!TSI`I~dTL#gl(z^oNWu~Ar3e0RdM*!}v6hA?c>`vC`pc>n} zny5_!Yw+j$8)PM{G7D;`|}ZdWcL6YFp`stcz~Tu&w%V6U;{>SauE-(lj#|d z-2-gENKP)|0d_Jy1G0O74H(JEMLfVxre{EQ53m6vIk|`j*va$^$nF6)U?e9O@c=uS qo&niCzy^%uPx)dPzhEL)?J!AY%6@TvU0=t$jB8?nzpQgTQQq9W$df3p9}|d z*nmAwX9ER}C_)j^lq*TfW1O!-Sb)6+1-txnb3RZir~vzgh=`P&wzk`x`BtP03vibx z_JYy_nlOZ1&XuIh|2?obKR?SqKi|y)BG_ynKS#I~Jk@;G4ECKd7oy`udBoGjT@nX0}&=qMhpXcoX$)NFrQAml$eOOYibmszOJps_`m=g zaDW-ea&&g~GEZ0%Xb9MdWIVTdGxnc5r`Y3{RaKZA9%k;}jEoopW|55L-3xX*vfXY) zsGgD%%uP)(0|x?)%7|`Y7RgZSJhP<*0oz*onxC0LcTtfp*x;>fP)2kEvq*+o_vvTO ztT3&qu`ygZdQ>-XaDo9D(FM#Z8EW099zTxQyZq#;)(hBc>Ul(+3+vj-59uV zfwkY2aXMv$8CZ{GsCEBZRu*=al*oqfwzuQKrAx+v7go8~AxT**Ntl53N`_kDxYSha zsj89<`|9iQ=-M@wUNvJ_Wh5l95y?>N?8WWd@y^MUvf*z|oxs(-2WkeI$jAU@5(3>cPjHm*el?=Uo@`?{7BdWk=B|{A$HYEkgWo5zP z9~v6)*yrQL`ZSN0j3@&0kPJ17_v-7hVdKW&@L%KO_@bhMJFwQth$65@6niM8mi*o# zEWjEvvI3ZwWUS_vUaYMoBQju~lEHtU>d&ZjG9m-!DH;0Pvu4I}8F>m!DJ33J{29PD zYf7(9Rzk=fha@E}+2#v>ekzLb^OQbVowls48XXn&>iey&zx``t3&jGWF*`FeVr}Ww z$!?E~d}ZI|HV2&j1B!p1e3J3o2IGy_dT&6&THRZ#bl@Rhb z5rn*)_V&+K+{24+cwMeH{gi$TO5XzTLU>!`R&9z9@~r@Tm@P?tOS6XjJj|_y|45=W a2mBA%&sAGg)_WfS0000Px*MM*?KRA@u(nr&=TWfaH%=e8@14SAEd4KNJZ?dZ0)_!2=7zsUzBDkVW;A_;9L z5`z$p(I}Z34IwHTh;HqI5kIJNi_sV{^9_g?f-HU6#?~%mMwqC8@;bJzy~o_j$RxG* zxwl=nNblGCKj(jb&-3)&^E|hN8|BfNF_Q2j0vvW*Z&Or2 zC@Sc!dH{&13qX@uGB;J$cZBrBifFR}%*+(7vE8X~!bQMpW}Yu%uBjpFCZ=WyXsT}L zYSq*W2n++Okim`CrIG>{E4-S4xdMKMB}CN2K(j=qrt12RBSgeTlIa5G+FGft_oL+s z6c;l+3~-4N(@bLsI6)FMGq~AaQgWDT_s2zZY65fP8dLb&(7mjX3(OBOFjF*nE_4LC z2w*=YI*=c4$GJqX8~{-`Z8V0XEp-%7^C8%RI|#o>>d z^1#DJKzm8&XV}16%TY*vNv9a-{F1(YPy*Tg4S#92SRO|lmITM%W5)7quJ$ptq=_gx zgNmIczSce!GQ6>BN@6h9p3QD;ECDCTT(Hzp*KuU{jD~9Dl}dv5Wowql3^0LSaWq7> zr2-3j?|qZvJ5B5JYwx>kyA)H`Zz zme|SoA%Jhs0D5$QiSUPMf~C6Z?e^dG6yN5pT#!%(Lkup`6E{pdI=~>w>-2Z|jT9a9 zmTzGNZyJdOkb7XY!LXOkw&^)`84jnOumoE|>dB?9)6T0oat{oNUU2#%uNs`8WLVHE zzsL%|Y#>J#fIV^y%mt$6BuV!AO4qT)HZ^u}@T~3}g!4{+baF7{R4{bRib{Q zax_G$G6QzYpELLYVE{8NbJj%;3F}h`!!;H6Boc`Ox^obH=JZD%%m`R-%SS{z9RA3& zx{Dna5OQ0eSD@&A(u;U&KC}W}c?}e96b2w1clx77-l5kl0v`&`$^~Y%UAk(^zLGa&?`x%b=CEq2h$Z2 z^jPm_=G_3_qE&FJ`$Tj}GF#?VzuWegR=g1KKeH@vXJ$iBUn2Se681o$Lj|R#pDkzS z(UpOoa%N>YgEr`S&!+?;dfn-d2pt{>11FbUjJuh6iqHzlw&e3 z^{HF83Oz>I)~d(9ljh7`Hota%znfz{+8w>+PT4>LpkH(l;8qV91dtq^_X4KL6T zu$mz3wN@z#x9HhAW@Tgu$H`QyP)81FqVS3 zoPenSO<}?XfP2B{CEz3z9lVK(zgXaFJugzYQO$?~8!c)i import("@/view/show/timing.vue"), - meta: { - title: "定时", - requireAuth: false, - }, - }, { name: "animation-demo", path: "base-components-demo/animation-demo", diff --git a/src/router.ts b/src/router.ts index db98e76..ee97e1e 100644 --- a/src/router.ts +++ b/src/router.ts @@ -40,32 +40,42 @@ const projectRoutes = [ path: "/tabs", component: () => import("@/view/tabs/tabs.vue"), meta: { - title: '智慧屏首頁' - } + title: "智慧屏首頁", + }, }, { name: "timingAdd", path: "/timingAdd", component: () => import("@/view/timing/timing-add.vue"), meta: { - title: '智慧屏首頁' - } + title: "", + }, }, { name: "timingSureDelete", path: "/timingSureDelete", component: () => import("@/view/timing/timing-sure-delete.vue"), meta: { - title: '智慧屏首頁' - } + title: "", + }, }, { name: "device-detail", path: "/device-detail", component: () => import("@/view/device-detail/device-detail.vue"), meta: { - title: '设备详情页' - } + title: "设备详情页", + }, + }, + { + name: "timingSelectDevice", + path: "/timingSelectDevice", + component: () => import("@/view/timing/timing-select-device.vue"), + }, + { + name: "timingSelectTime", + path: "/timingSelectTime", + component: () => import("@/view/timing/timing-select-time.vue"), }, // 非哈希路由暂不启用 { diff --git a/src/styles/framework/base/flexbox.scss b/src/styles/framework/base/flexbox.scss index 968c1c7..ec3b711 100644 --- a/src/styles/framework/base/flexbox.scss +++ b/src/styles/framework/base/flexbox.scss @@ -240,6 +240,7 @@ Flex, Grow, & Shrink 待确定 line-height: 1; } } + //智慧屏标题 .zhp-title { padding-top: 31px; @@ -247,6 +248,7 @@ Flex, Grow, & Shrink 待确定 width: 100vw; position: relative; } + //智慧屏标题 .zhp-title-text { margin-top: 4px; @@ -254,11 +256,14 @@ Flex, Grow, & Shrink 待确定 text-align: center; font-size: 40px; } + //智慧屏背景 .base-bg { + display: flex; + flex-direction: column; position: relative; background-image: url("@/assets/imgs/show/bg_timing.png"); - height: 720px; + height: 100vh; width: 720px; //智慧屏返回键 .leftImg { @@ -267,4 +272,46 @@ Flex, Grow, & Shrink 待确定 position: absolute; left: 24px; } + + .bottom-s-c { + left: 24px; + right: 24px; + position: absolute; + bottom: 0; + flex-wrap: wrap; + display: flex; + justify-content: space-between; + padding-top: 30px; + padding-bottom: 30px; + background-color: rgba($color: #0A101A, $alpha: 0.7); + + .bottom-s { + margin-left: 20px; + display: flex; + align-items: center; + justify-content: center; + background-repeat: no-repeat; + background-size: contain; + color: #ffffff; + font-size: 40px; + font-weight: 400; + width: 326px; + height: 110px; + background-image: url("@/assets/imgs/show/bg_btn_blue.png"); + } + + .bottom-c { + display: flex; + align-items: center; + justify-content: center; + background-repeat: no-repeat; + background-size: contain; + color: #ffffff; + font-size: 40px; + font-weight: 400; + width: 326px; + height: 110px; + background-image: url("@/assets/imgs/show/bg_btn_gray.png"); + } + } } diff --git a/src/view/tabs/device-control.vue b/src/view/tabs/device-control.vue index b23b8ee..a8eff0b 100644 --- a/src/view/tabs/device-control.vue +++ b/src/view/tabs/device-control.vue @@ -16,7 +16,6 @@ 'air-quality-liang': item.airQuality === '良', 'air-quality-cha': item.airQuality === '差', }" - @click="goToDetail(item)" >
{{ item.name }}
@@ -39,7 +38,7 @@ {{ i }}
-
+
@@ -62,7 +61,6 @@ \ No newline at end of file + diff --git a/src/view/tabs/fixed-time.vue b/src/view/tabs/fixed-time.vue index 8f3f362..09b07c7 100644 --- a/src/view/tabs/fixed-time.vue +++ b/src/view/tabs/fixed-time.vue @@ -65,9 +65,6 @@ import { useRouter } from "vue-router"; import { ref } from "vue"; import { TimingDto } from "@/dto/timing-dto"; -import timing from "@/view/show/timing.vue"; -import type from "async-validator/dist-types/rule/type"; -import { Toast } from "vant"; const router = useRouter(); @@ -172,21 +169,20 @@ const navList = ref([ } .base-timing-card-content-unSelectBg { - width: 100vw; - margin-left: 45px; + width: 672px; margin-bottom: 12px; height: 126px; background-image: url(@/assets/imgs/show/bg_item_timing_unselect.png); - background-size: contain; + background-size: 100% 100%; background-repeat: no-repeat; } .base-timing-card-content-selectBg { - margin-left: 45px; margin-bottom: 12px; + background-size: 100% 100%; + width: 672px; height: 126px; background-image: url(@/assets/imgs/show/bg_item_timing_select.png); - background-size: contain; background-repeat: no-repeat; } @@ -206,10 +202,13 @@ const navList = ref([ } .stateBg { + display: flex; margin-left: 14px; background-image: url(@/assets/imgs/show/btn_item_timing_open.png); background-size: contain; background-repeat: no-repeat; + align-items: center; + justify-content: center; width: 56px; height: 32px; } @@ -217,7 +216,7 @@ const navList = ref([ .state { line-height: 32px; font-weight: 400; - font-size: 10px; + font-size: 18px; color: #ffffff; } diff --git a/src/view/timing/timing-add.vue b/src/view/timing/timing-add.vue index ae22cd1..0a573db 100644 --- a/src/view/timing/timing-add.vue +++ b/src/view/timing/timing-add.vue @@ -52,28 +52,60 @@
时间
-
1小时后
+
{{ time }}小时后
-
+
设备
-
1台空调
+
{{ selectNum }}台空调
-
保存
+
保存
- diff --git a/src/view/timing/timing-select-time.vue b/src/view/timing/timing-select-time.vue new file mode 100644 index 0000000..ee2bfb8 --- /dev/null +++ b/src/view/timing/timing-select-time.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/view/timing/timing-sure-delete.vue b/src/view/timing/timing-sure-delete.vue index 9e3f851..456fae5 100644 --- a/src/view/timing/timing-sure-delete.vue +++ b/src/view/timing/timing-sure-delete.vue @@ -14,60 +14,36 @@ -