From 47643f55bec1e20340fa67d1fd019c621a032ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Wed, 4 Sep 2024 14:31:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=B8=8D=E5=90=8C=E7=94=B5?= =?UTF-8?q?=E9=87=8Ficon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/home.vue | 8 ++++---- pages/lockDetail/lockDetail.vue | 6 +++--- static/images/icon_power.png | Bin 2916 -> 0 bytes static/images/icon_power_1.png | Bin 0 -> 859 bytes static/images/icon_power_2.png | Bin 0 -> 907 bytes static/images/icon_power_3.png | Bin 0 -> 940 bytes static/images/icon_power_4.png | Bin 0 -> 930 bytes static/images/icon_power_5.png | Bin 0 -> 826 bytes stores/lock.js | 15 +++++++++++++++ 9 files changed, 22 insertions(+), 7 deletions(-) delete mode 100755 static/images/icon_power.png create mode 100755 static/images/icon_power_1.png create mode 100755 static/images/icon_power_2.png create mode 100755 static/images/icon_power_3.png create mode 100755 static/images/icon_power_4.png create mode 100755 static/images/icon_power_5.png diff --git a/pages/home/home.vue b/pages/home/home.vue index b24d3a2..627264a 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -33,8 +33,8 @@ - - {{lock.electricQuantity}}% + + {{ lock.electricQuantity }}% {{getRole(lock.userType, lock.keyRight)}} @@ -147,7 +147,7 @@ methods: { timeFormat, ...mapActions(useUserStore, ['updateUserInfo', 'updateLoginStatus', 'phoneLogin', 'getUserInfo']), - ...mapActions(useLockStore, ['getLockList', 'getRole', 'getTimeLimit', 'updateLockSearch']), + ...mapActions(useLockStore, ['getLockList', 'getRole', 'getTimeLimit', 'updateLockSearch', 'getPowerIcon']), ...mapActions(useBluetoothStore, ['getBluetoothStatus', 'initAndListenBluetooth', 'updateCurrentLockInfo', 'checkSetting', 'updateKeyId', 'resetDevice']), ...mapActions(useBasicStore, ['routeJump', 'getDeviceInfo']), @@ -548,7 +548,7 @@ page { .lock-top-right-power-image { width: 40rpx; - height: 40rpx; + height: 24rpx; margin-right: 10rpx; } } diff --git a/pages/lockDetail/lockDetail.vue b/pages/lockDetail/lockDetail.vue index 83b91d2..d4befbc 100644 --- a/pages/lockDetail/lockDetail.vue +++ b/pages/lockDetail/lockDetail.vue @@ -6,7 +6,7 @@ - + {{ currentLockInfo.electricQuantity }}% @@ -85,7 +85,7 @@ export default { this.getServeTime() }, methods: { - ...mapActions(useLockStore, ['getRole', 'updateLockSearch', 'getLockList']), + ...mapActions(useLockStore, ['getRole', 'updateLockSearch', 'getLockList', 'getPowerIcon']), ...mapActions(useBluetoothStore, ['openDoor', 'updateServerTimestamp']), ...mapActions(useBasicStore, ['routeJump', 'backAndToast']), powerTip() { @@ -246,7 +246,7 @@ export default { .power-icon { width: 50rpx; margin-right: 10rpx; - height: 50rpx; + height: 30rpx; } .power-text { diff --git a/static/images/icon_power.png b/static/images/icon_power.png deleted file mode 100755 index ceeeb8dd9b95fd9c094b9799c7b5d55cb8f591fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2916 zcmeH}`9IX{8pp@^b9YZ>Mi2mNrO9700g>^^82BI!LVX?j z(i#*2q_ln9-$oH+NxZnBpC^e0dQd^ow~q3<@fF_O*s7-~PYpf8ly_6fh5qdA$ka_#xs;M_Skw z(AoW)3M@;PJrmB-c*ZC%BBS0Ij9dM2%qDsM06W~FWGMQ%RqiRJL$uVCd$^!zX!|qk z2L^sA8y!!l9J-wk`Akw*+GPD|7s?BLu9dV@2xvIu&}?U6zQl3vW*Wmv+YX~<$Tunq z`>O1`{~ozTB{_4tZS7I)9d6M6^z0BM^@lboQuhn*K=t`AUZQTsa)A9~`jvUc_HWv} zfYR{3l})uFJR4&iy8HrV(;^=KxgGlSgBpb@>nJ~GOEw^Z9Q9y=3R@aF ziv9iBzf-b{SKV!${Bz+W7H_u5k+uss`UIVs;W5ve(D8zV$aq%k)G%{jT6F)ZLPAek zLC*~GN3E8pqx(H4fXyfO+ncnuUbBc!{i2>^kdTHJFj&Fg>Gny5uPjY$sXu0IIhP%I zQ%aKUW3Zd2pz>X(N%>mqzs83)f8Ri1%!l)hT#HQkWWD?Y&_*Cd*$LEq85fqrE9z8=s0QOqTNyRuuDc4=DUNxp7aQqL^Sz9Fyu2Q!cu;Lq4u z=R3dVoS8P}p(mf$rQoaojp93qWt@h-%zk>#shXFA`(-OFm?6wPFCSeQ`H0`G&B~5G z_o_H)`jZNOS6JSs3;}(h&B*5K8OiWrt(fgNW7p?I8;kx^%k;{b?=TXE=zzFyv*N~v zn3r(Whr9((m~_KYpq-r&9ekmjqM^AHu6pZIvHEX=;D*5L8swKb2Sm>vfhn72Gq%+^ z&{yQ7H-{qXoI6OVN;}}X5snY9ycI(U)$tJwPqy?-p?>Z9z#7zUG`Jz2 z^2)bB+Od3-qm<`MEIgx2>iF6Wem0@eW2BB?lee$J1L>}12;%@!2vDJFzJ(S`RgJgz z^{!xVmJJk~(i4HT-jk`>fwH3`t-L-QYcg_n-FS-wfr=Mq^UY$Zf5dlJfz&mMW#f#c|Jf`uS#;#ds)h;{OXf`akY(SpDo z$ar-vuBer;#|+piIMHj#t23fz$uSSJ+5*J(saxj04`4QK*Uxdn5|Op=JW37_y)$8` zy}}Alp7M+H(?1nB-t>5>D;(yT^W~bBGqjQVN-e756X9lW1gCx#OiAAt9xMDjjJ~N) zyT?}ggiwDZpcaerheUr#9MNldP7kCLMoJO$3r)%czB>OZslMWrZjMI2Le56 z@XN=d9OPeazxnuVi_9jD8_qE=ku-3e%Z%B$<)GAjt{ur|&5ljvdctKFaU2G1`+|$O ze1hT4{FD6j`qkQS7WF|y{@TT`6`yU|fUSMg(sZSZOAiN|X9>Mlsl{SYP7ZJnMJ=PO zw*2a}_(}gh^5X<^VT|QZ?zyJyF_7r{OyL2EH*`b)`D>p+>%a}b{C!7A4Rcw>E0By>L~X64+JN__WtY4oEaDw+Zfo#>=wlg7Bib(>BC*SyEbt@i%j z74M_?Tg?$zuHp$0>g)cn#`(sFJ?;#D#?mMFypI23u(aXrSy?A`$6}UsWw{z4+Pteh0pUB&!H?DZ06I z8P)M{2BfIdcL)ma$xFud0HS%+nyv{AW?)o&& zThjm-`1rf%jPCloO1Pv=vi|e4hNN{z$9c?nFt%HwhoUbLvt53olDQ-*Bfnhb9LkLm zuawIXByz0mH$&9AdKq9FUEfH=g{m=-h2=PBpF;d33O*P7b!4xQ~?ekGAyDrMDpxaI8b{nJFSLk>A9eB{wH{qm

^cX*P!U=pWFhQGo*~{r-A4YElyTcg2vKo| z8~%c$lP4`~&yrm`Ug?~8*_H~L=c--LqFzvIPb d{Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91JfH&r1ONa40RR91Bme*a0NYPB9{>OX#Ysd#RA>e5nLlsSKp4h-b^bVs zN~;bawN^Ix2uvtaBLOoXfq|KUiH((kfrW*Sz>FA>3W5QNjTI^(wP_I`Q7B4mNaEvn zsZkQ^Y~KKmZTY0r{eSOy-siRByI5A0Di2g1s60?04+tIBk?Y=|zfbNlp=n7OSVE|| zb+UF1{i{erX<09U_QYv6--`YHUuhs}F%$Zb>|*F0L=TxWrfo|h)~Uy>i81w`x+Q3Y z*u;7lY`dQ4eWX4}+bs@!Pm#5yd=OaH5J_8@_Z`PMF!5sArvGZ(-`Tl@Aos}E!1v6A z@S1LO2)4<`fe=Fo-wvdFB&EDN8jrVh^H zqgTjR37u^dqgl>Dh~Hr2Q8r8Zkj4tj?a;)Ju>4-1PA6t&Gn{qyZkfpGbZD|`oWk?9 zbMF~@alSZ%8u*Ap^#W^}?50=PWMxj~px6i{E&-BF&Rx_I9yY59o`5YKeOhZ~r7`(5!#Oo5%cQAH{vDv+}=lkni z(#NgIh-SFW*|WQW5bCA%9F;$r0Eh#>$7`UEfga^$^6Z}n4Cm*c2SOOK>b(03QTAGm l##a-<)tt%$l?RILfj<-P%cU)T;~fA1002ovPDHLkV1hB|b`Agl literal 0 HcmV?d00001 diff --git a/static/images/icon_power_2.png b/static/images/icon_power_2.png new file mode 100755 index 0000000000000000000000000000000000000000..e9eb3622377cd86c8c4f96c1700ba01f5a82c8b3 GIT binary patch literal 907 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 BU~K>Z literal 0 HcmV?d00001 diff --git a/stores/lock.js b/stores/lock.js index 27b541a..7215160 100644 --- a/stores/lock.js +++ b/stores/lock.js @@ -51,6 +51,21 @@ export const useLockStore = defineStore('lock', { } }, actions: { + // 获取电量icon + getPowerIcon(power) { + if(power >= 80) { + return '/static/images/icon_power_5.png' + } else if(power >= 60) { + return '/static/images/icon_power_4.png' + } else if(power >= 40) { + return '/static/images/icon_power_3.png' + } else if(power >= 20) { + return '/static/images/icon_power_2.png' + } else { + return '/static/images/icon_power_1.png' + } + }, + // 将星期转换为中文字符串 convertWeekDaysToChineseString(weekDays) { const dayMap = { 1: '一',