Commit 83bc4e2be69dfcd62fad8ad679a24402b620c4ba
Merge branch 'fix/DEFECT-1898' into 'main_dev'
fix: 修复设备详情物模型趋势数据排序无效 See merge request yunteng/thingskit-front!1192
Showing
1 changed file
with
7 additions
and
4 deletions
| @@ -145,10 +145,13 @@ | @@ -145,10 +145,13 @@ | ||
| 145 | if (!hasDeviceAttr()) return; | 145 | if (!hasDeviceAttr()) return; |
| 146 | // 发送请求 | 146 | // 发送请求 |
| 147 | loading.value = true; | 147 | loading.value = true; |
| 148 | - const res = await getDeviceHistoryInfo({ | ||
| 149 | - ...searchParams, | ||
| 150 | - entityId: props.deviceDetail.tbDeviceId, | ||
| 151 | - }); | 148 | + const res = await getDeviceHistoryInfo( |
| 149 | + { | ||
| 150 | + ...searchParams, | ||
| 151 | + entityId: props.deviceDetail.tbDeviceId, | ||
| 152 | + }, | ||
| 153 | + searchParams.orderBy as OrderByEnum | ||
| 154 | + ); | ||
| 152 | historyData.value = getTableHistoryData(res); | 155 | historyData.value = getTableHistoryData(res); |
| 153 | loading.value = false; | 156 | loading.value = false; |
| 154 | // 判断数据对象是否为空 | 157 | // 判断数据对象是否为空 |