Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
4f53774549
|
|
@ -1387,8 +1387,9 @@
|
|||
rollTo(Number(secondTarget))
|
||||
} else if (typeNow.value === 3) {
|
||||
tempmessage.value = allArray.value[typeNowtarget.value]
|
||||
console.log("啥啊",tempmessage.value)
|
||||
const thirdTarget = tempmessage.value.temperature
|
||||
|
||||
|
||||
rollTo(Number(thirdTarget))
|
||||
}
|
||||
else if (!typeNow.value) {
|
||||
|
|
@ -1454,6 +1455,7 @@
|
|||
})
|
||||
}
|
||||
if ( res.result.humidDeviceEntityList != null) {
|
||||
console.log("xxxx",res.result.humidDeviceEntityList)
|
||||
res.result.humidDeviceEntityList.forEach((element : any, index : number) => {
|
||||
element.typeNumber = 3
|
||||
element.lookName = "温度计" + (index+1)
|
||||
|
|
@ -1461,9 +1463,18 @@
|
|||
allArray.value.push(element)
|
||||
wendushow.value.temperature = element.temperature
|
||||
wendushow.value.humidity = element.humidity
|
||||
console.log("xxxx",element)
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
if (typeNow.value === 3) {
|
||||
tempmessage.value = JSON.parse(JSON.stringify(allArray.value[typeNowtarget.value]))
|
||||
console.log("啥啊",tempmessage.value)
|
||||
const thirdTarget = tempmessage.value.temperature
|
||||
|
||||
rollTo(Number(thirdTarget))
|
||||
}
|
||||
|
||||
// 重新刷新动画
|
||||
|
||||
let donghua = typeNowtarget.value;
|
||||
|
|
|
|||
Loading…
Reference in New Issue