Merge branch 'fix/DEFECT-1904' into 'main_dev'

fix: 修复设备分布的历史数据查询中升降序未生效

See merge request yunteng/thingskit-front!1196

@@ -130,7 +130,7 @@
   import lx1 from '/@/assets/images/lx1.png';
   import { TimePeriodForm, useTimePeriodForm } from './cpns/TimePeriodForm';
   import { selectDeviceAttrSchema } from './config.data';
-  import { defaultSchemas } from './cpns/TimePeriodForm/config';
+  import { OrderByEnum, defaultSchemas } from './cpns/TimePeriodForm/config';
   import { QueryWay, SchemaFiled, AggregateDataEnum } from './cpns/TimePeriodForm/config';
   import { useAsyncQueue } from './useAsyncQueue';
   import { useHistoryData } from '../list/hook/useHistoryData';
@@ -457,11 +457,14 @@
           await method.validate();
           const value = method.getFieldsValue();
           const searchParams = getSearchParams(value);
-
+          const { orderBy } = searchParams || {};
           if (!hasDeviceAttr()) return;
           // 发送请求
           loading.value = true;
-          const res = await getDeviceHistoryInfo({ ...searchParams, entityId });
+          const res = await getDeviceHistoryInfo(
+            { ...searchParams, entityId },
+            orderBy as OrderByEnum
+          );
           loading.value = false;
           historyData.value = getTableHistoryData(res);
           // 判断数据对象是否为空