Merge remote-tracking branch 'origin/main'

This commit is contained in:
谷成伟 2024-11-07 10:52:39 +08:00
commit 8c112b51af

View File

@ -307,31 +307,25 @@ const airBlowerOperate = async (type: 'setTurbineFastStart' | 'setTurbineStop' |
for (let i = 0; i < mutiTaskList.value.length; i++) { for (let i = 0; i < mutiTaskList.value.length; i++) {
mutiTaskList.value[i].loading = 1 mutiTaskList.value[i].loading = 1
console.log(mutiTaskList.value[i].deviceName) console.log(mutiTaskList.value[i].deviceName)
await runTask(mutiTaskList.value[i].sendData) runTask(mutiTaskList.value[i].sendData, i)
} }
} }
const runTask = (data: any) => { const runTask = (data: any, index: number) => {
console.log(data)
return sendCommandReq(data) return sendCommandReq(data)
.then((res: any) => { .then((res: any) => {
console.log(res) console.log(res)
if (res.success) { if (res.success) {
console.log(data, 'success') console.log(data, 'success')
for (let i = 0; i < mutiTaskList.value.length; i++) { mutiTaskList.value[index].loading = 2
if (mutiTaskList.value[i].sendData.deviceId === data.deviceId) { } else {
mutiTaskList.value[i].loading = 2 mutiTaskList.value[index].loading = 3
break
}
}
} }
}) })
.catch(() => { .catch(() => {
for (let i = 0; i < mutiTaskList.value.length; i++) { mutiTaskList.value[index].loading = 3
if (mutiTaskList.value[i].sendData.deviceId === data.deviceId) {
mutiTaskList.value[i].loading = 3
break
}
}
}) })
} }