Merge remote-tracking branch 'origin/main'

2024-10-31 17:47:06 +08:00 · 2024-10-31 17:47:06 +08:00 · 6d53615f8c
commit 6d53615f8c
parent 3be8531fe6 86c395c8e0
1 changed files with 1 additions and 1 deletions
--- a/ui/dasadmin/src/views/backend/report/MulipleReport.vue
+++ b/ui/dasadmin/src/views/backend/report/MulipleReport.vue
@ -244,7 +244,7 @@ const selectWindBlower = (val: any) => {

 const addColumn = () => {
    if (!windBlowerValue.value.length) return ElMessage.warning('请先选择风机！')
-    iotModelId.value = windBlowerList.value[0].modelId
+    iotModelId.value = windBlowerList.value?.find((val) => val.irn == windBlowerValue.value[0])!.modelId
    showMeasure.value = true
 }
 const addRow = () => {}