Browse Source

fix:loading修改

master
guoapeng 2 months ago
parent
commit
b056244bad
  1. 2
      src/components/CustomNavBar.tsx
  2. 9
      src/pages/Measure.tsx

2
src/components/CustomNavBar.tsx

@ -54,7 +54,7 @@ export default function CustomNavBar({ title }: { title: string }) {
transition: 'transform 300ms',
}}
/>
<div className="bluetooth-battery">
<div className="bluetooth-battery ml-2">
<div className="bg-color" style={{ width: `${device.power || 0}%`, backgroundColor: device.flag ? '#1dbb1d' : device.power > 20 ? '#3e63cb' : 'red' }}></div>
<div className={'power-head'} style={{ backgroundColor: device.flag && device.power === 100? '#1dbb1d' : device.power === 100 ? '#3e63cb' : 'rgba(0,0,0,0.3)' }}></div>
<span className="power-num">{device.power || 0}</span>

9
src/pages/Measure.tsx

@ -437,11 +437,12 @@ export default function Measure() {
<main className="home-page-content overflow-x-hidden overflow-y-auto">
<div className="relative h-0 p-0 pb-[70%]">
{/**正在校准时的loading */}
{caloading && (
<Mask opacity="thin" className="h-[100vh] flex justify-center items-center">
<div style={{ margin: '45%' }}>
{/*caloading*/}
{(
<Mask opacity='thick' className="h-[100vh] flex justify-center items-center">
<div style={{ margin: '45%', display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center' }}>
<SpinLoading color="#5c92b4" />
<div className="w-[100px] mt-[20px] text-[#5c92b4]">...</div>
<span className="whitespace-nowrap mt-5 text-[#5c92b4]" style={{fontSize: '16px'}}>...</span>
</div>
</Mask>
)}

Loading…
Cancel
Save