fix(lockscreen): 修复距离电池充满时间显示错误

This commit is contained in:
chika
2021-07-31 14:11:24 +08:00
parent 9d9cac8064
commit 0c709871f3
3 changed files with 17 additions and 2 deletions
+3 -1
View File
@@ -21,6 +21,7 @@
:battery="battery" :battery="battery"
:battery-status="batteryStatus" :battery-status="batteryStatus"
:calc-discharging-time="calcDischargingTime" :calc-discharging-time="calcDischargingTime"
:calc-charging-time="calcChargingTime"
/> />
<div class="local-time"> <div class="local-time">
@@ -114,7 +115,7 @@
const router = useRouter(); const router = useRouter();
const route = useRoute(); const route = useRoute();
const { battery, batteryStatus, calcDischargingTime } = useBattery(); const { battery, batteryStatus, calcDischargingTime, calcChargingTime } = useBattery();
const userInfo: object = userStore.getUserInfo || {}; const userInfo: object = userStore.getUserInfo || {};
const username = userInfo['username'] || ''; const username = userInfo['username'] || '';
const state = reactive({ const state = reactive({
@@ -176,6 +177,7 @@
battery, battery,
batteryStatus, batteryStatus,
calcDischargingTime, calcDischargingTime,
calcChargingTime,
onLockLogin, onLockLogin,
onLogin, onLogin,
goLogin, goLogin,
+5 -1
View File
@@ -13,7 +13,7 @@
剩余可使用时间{{ calcDischargingTime }} 剩余可使用时间{{ calcDischargingTime }}
</div> </div>
<span v-show="Number.isFinite(battery.chargingTime) && battery.chargingTime != 0"> <span v-show="Number.isFinite(battery.chargingTime) && battery.chargingTime != 0">
距离电池充满需要{{ calcDischargingTime }} 距离电池充满需要{{ calcChargingTime }}
</span> </span>
</div> </div>
</div> </div>
@@ -36,6 +36,10 @@
type: String, type: String,
default: '', default: '',
}, },
calcChargingTime: {
type: String,
default: '',
},
batteryStatus: { batteryStatus: {
// 电池状态 // 电池状态
type: String, type: String,
+9
View File
@@ -33,6 +33,14 @@ export const useBattery = () => {
return `${~~hour}小时${~~minute}分钟`; return `${~~hour}小时${~~minute}分钟`;
}); });
// 计算电池充满剩余时间
const calcChargingTime = computed(() => {
console.log(state.battery);
const hour = state.battery.chargingTime / 3600;
const minute = (state.battery.chargingTime / 60) % 60;
return `${~~hour}小时${~~minute}分钟`;
});
// 电池状态 // 电池状态
const batteryStatus = computed(() => { const batteryStatus = computed(() => {
if (state.battery.charging && state.battery.level >= 100) { if (state.battery.charging && state.battery.level >= 100) {
@@ -80,5 +88,6 @@ export const useBattery = () => {
...toRefs(state), ...toRefs(state),
batteryStatus, batteryStatus,
calcDischargingTime, calcDischargingTime,
calcChargingTime,
}; };
}; };