Browse Source

优化按钮

feature/0607-opt
LiLongLong 3 months ago
parent
commit
dbae9cb401
  1. 30
      src/pages/measure/components/MeasureAction.tsx
  2. 2
      src/pages/measure/components/MeasureDetail.tsx

30
src/pages/measure/components/MeasureAction.tsx

@ -127,12 +127,14 @@ export default function MeasureAction() {
}); });
}; };
const [startLoading, setStartLoading] = useState(false)
// 开始/重新测量按钮点击事件 // 开始/重新测量按钮点击事件
const onStart = useCallback(() => { const onStart = useCallback(() => {
if (!deviceInfo.isConnected) {
message.error("请先连接设备");
return;
}
// if (!deviceInfo.isConnected) {
// message.error("请先连接设备");
// return;
// }
setStartLoading(true)
setAudioList([]) setAudioList([])
// if(deviceInfo.power < 20){ // if(deviceInfo.power < 20){
// message.error('电量低于20%,请充电后再测量!') // message.error('电量低于20%,请充电后再测量!')
@ -149,6 +151,9 @@ export default function MeasureAction() {
canvasRef.current?.clearShapes(); canvasRef.current?.clearShapes();
canvasRef.current?.resetCanvas(); canvasRef.current?.resetCanvas();
startMeasurement().then(res => { startMeasurement().then(res => {
setTimeout(()=>{
setStartLoading(false)
}, 1000)
if (res.status !== 0) { if (res.status !== 0) {
message.error(res.data.info); message.error(res.data.info);
} else { } else {
@ -246,7 +251,6 @@ export default function MeasureAction() {
const [audioList, setAudioList] = useState<HTMLAudioElement[]>([]) const [audioList, setAudioList] = useState<HTMLAudioElement[]>([])
const pauseAudio = () => { const pauseAudio = () => {
audioList.forEach(audio => { audioList.forEach(audio => {
console.log('-----------111-------------')
audio.pause() audio.pause()
}) })
} }
@ -323,7 +327,7 @@ export default function MeasureAction() {
updated[5].color = STEP_COLOR_GREEN; updated[5].color = STEP_COLOR_GREEN;
setMeasurementFinished(true); setMeasurementFinished(true);
pauseAudio() pauseAudio()
const audio4 = new Audio("/audio/measure_end.mp3");
const audio4 = new Audio("/audio/side_end.mp3");//measure_end
// 播放音频 // 播放音频
audio4 audio4
.play() .play()
@ -333,6 +337,18 @@ export default function MeasureAction() {
.catch(err => { .catch(err => {
console.error("播放音频时出错:", err); console.error("播放音频时出错:", err);
}); });
break;
case "FINISH_RECORD":
const audioFinish= new Audio("/audio/measure_end.mp3");//measure_end
// 播放音频
audioFinish
.play()
.then(() => {
console.log("音频开始播放");
})
.catch(err => {
console.error("播放音频时出错:", err);
});
setCaLoading(true) setCaLoading(true)
setLoadingText('正在处理测量数据...') setLoadingText('正在处理测量数据...')
break; break;
@ -624,7 +640,7 @@ export default function MeasureAction() {
))} ))}
</div> </div>
<section className="flex flex-col items-center gap-4 mt-6 border-t border-[#D8D8D8] py-4"> <section className="flex flex-col items-center gap-4 mt-6 border-t border-[#D8D8D8] py-4">
<Button style={{ width: 200 }} size="large" type="primary" onClick={onStart}>
<Button style={{ width: 200 }} size="large" type="primary" onClick={onStart} loading={startLoading}>
{startBtnText} {startBtnText}
</Button> </Button>
<Button <Button

2
src/pages/measure/components/MeasureDetail.tsx

@ -346,7 +346,7 @@ export default function MeasureDetail() {
} }
const [pageNum, setPageNum] = useState(1) const [pageNum, setPageNum] = useState(1)
const [pageSize, setPageSize] = useState(5)
const [pageSize, setPageSize] = useState(8)
const onPageChange = (pageNumValue:number, pageSizeValue:number) => { const onPageChange = (pageNumValue:number, pageSizeValue:number) => {
setPageNum(pageNumValue) setPageNum(pageNumValue)
setPageSize(pageSizeValue) setPageSize(pageSizeValue)

Loading…
Cancel
Save