mirror of
https://github.com/jekip/naive-ui-admin.git
synced 2026-02-12 17:22:26 +08:00
fix(lockscreen): 修复距离电池充满时间显示错误
This commit is contained in:
@@ -21,6 +21,7 @@
|
||||
:battery="battery"
|
||||
:battery-status="batteryStatus"
|
||||
:calc-discharging-time="calcDischargingTime"
|
||||
:calc-charging-time="calcChargingTime"
|
||||
/>
|
||||
|
||||
<div class="local-time">
|
||||
@@ -114,7 +115,7 @@
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
|
||||
const { battery, batteryStatus, calcDischargingTime } = useBattery();
|
||||
const { battery, batteryStatus, calcDischargingTime, calcChargingTime } = useBattery();
|
||||
const userInfo: object = userStore.getUserInfo || {};
|
||||
const username = userInfo['username'] || '';
|
||||
const state = reactive({
|
||||
@@ -176,6 +177,7 @@
|
||||
battery,
|
||||
batteryStatus,
|
||||
calcDischargingTime,
|
||||
calcChargingTime,
|
||||
onLockLogin,
|
||||
onLogin,
|
||||
goLogin,
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
剩余可使用时间:{{ calcDischargingTime }}
|
||||
</div>
|
||||
<span v-show="Number.isFinite(battery.chargingTime) && battery.chargingTime != 0">
|
||||
距离电池充满需要:{{ calcDischargingTime }}
|
||||
距离电池充满需要:{{ calcChargingTime }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -36,6 +36,10 @@
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
calcChargingTime: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
batteryStatus: {
|
||||
// 电池状态
|
||||
type: String,
|
||||
|
||||
Reference in New Issue
Block a user