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

fix: 设备详情表格排序不生效

See merge request yunteng/thingskit-front!1183

@@ -17,7 +17,7 @@ export const getDeviceHistoryInfo = (params: Recordable, orderBy = OrderByEnum.D
   return defHttp.get<HistoryData>(
   return defHttp.get<HistoryData>(
     {
     {
       url: `/plugins/telemetry/DEVICE/${params.entityId}/values/timeseries`,
       url: `/plugins/telemetry/DEVICE/${params.entityId}/values/timeseries`,
-      params: { orderBy, ...params, entityId: null },
+      params: { ...params, entityId: null, orderBy },
     },
     },
     {
     {
       joinPrefix: false,
       joinPrefix: false,

@@ -14,7 +14,7 @@
   import { ColEx } from '/@/components/Form/src/types';
   import { ColEx } from '/@/components/Form/src/types';
   import { useHistoryData } from '../../hook/useHistoryData';
   import { useHistoryData } from '../../hook/useHistoryData';
   import { formatToDateTime } from '/@/utils/dateUtil';
   import { formatToDateTime } from '/@/utils/dateUtil';
-  import { useTable, BasicTable, BasicColumn } from '/@/components/Table';
+  import { useTable, BasicTable, BasicColumn, SorterResult } from '/@/components/Table';
   import {
   import {
     ModeSwitchButton,
     ModeSwitchButton,
     TABLE_CHART_MODE_LIST,
     TABLE_CHART_MODE_LIST,
@@ -64,7 +64,7 @@
   }
   }
 
 
   const sortOrder = ref<any>('descend');
   const sortOrder = ref<any>('descend');
-  const columns: BasicColumn[] | any = computed(() => {
+  const columns = computed<BasicColumn[]>(() => {
     return [
     return [
       {
       {
         title: '属性',
         title: '属性',
@@ -119,7 +119,7 @@
     loading.value = false;
     loading.value = false;
   };
   };
 
 
-  const handleTableChange = async (_pag, _filters, sorter: any) => {
+  const handleTableChange = async (_pag, _filters, sorter: SorterResult) => {
     sortOrder.value = sorter.order;
     sortOrder.value = sorter.order;
     await setColumns(unref(columns));
     await setColumns(unref(columns));
     if (sorter.field == 'ts') {
     if (sorter.field == 'ts') {