diff --git a/src/components/content/windPressure/WindPressureList.vue b/src/components/content/windPressure/WindPressureList.vue index 5ab861d..fd9a7e8 100644 --- a/src/components/content/windPressure/WindPressureList.vue +++ b/src/components/content/windPressure/WindPressureList.vue @@ -16,21 +16,25 @@ const props = defineProps({ }); const wpList = ref([]); watch(() => props.list, (now, old) => { - now.map(item=>{ - item.unit='Pa' + wpList.value.forEach(item=>{ + now.forEach(item2=>{ + if(item.equipmentId === item2.equipmentId){ + item.value = item2.value + } + }) }) - wpList.value = now }, {deep: true}); watch(() => props.winData, (now) => { - getScreenInfo(now) + getScreenInfo(now.windPressureSensorList) }, {deep: true}); const getScreenInfo = (now) => { let windPressureObj = {} let windPressureArr = [] - now.windPressureSensorList.map(item => { + now.map(item => { windPressureObj = { + equipmentId:item.equipmentId, max: 120, value: item.value, point: item.valueThreshold,