Merge branch 'main_dev' into local_dev_branch_by_ft

@@ -2,6 +2,7 @@ import { DeviceProfileModel } from '../../device/model/deviceModel';
 import { HistoryData } from './model';
 import { defHttp } from '/@/utils/http/axios';
 import { isString } from '/@/utils/is';
+import { OrderByEnum } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
 
 // 获取设备配置
 export const getDeviceProfile = (deviceType?: string) => {
@@ -12,11 +13,11 @@ export const getDeviceProfile = (deviceType?: string) => {
 };
 
 // 获取历史数据
-export const getDeviceHistoryInfo = (params: Recordable, orderBy?: string) => {
+export const getDeviceHistoryInfo = (params: Recordable, orderBy = OrderByEnum.DESC) => {
   return defHttp.get<HistoryData>(
     {
       url: `/plugins/telemetry/DEVICE/${params.entityId}/values/timeseries`,
-      params: { ...params, entityId: null, orderBy: orderBy || 'DESC' },
+      params: { orderBy, ...params, entityId: null },
     },
     {
       joinPrefix: false,

@@ -5,7 +5,10 @@
   import { useECharts } from '/@/hooks/web/useECharts';
   import { AggregateDataEnum, selectDeviceAttrSchema } from '/@/views/device/localtion/config.data';
   import { useTimePeriodForm } from '/@/views/device/localtion/cpns/TimePeriodForm';
-  import { defaultSchemas } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
+  import {
+    defaultSchemas,
+    OrderByEnum,
+  } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
   import TimePeriodForm from '/@/views/device/localtion/cpns/TimePeriodForm/TimePeriodForm.vue';
   import { useGridLayout } from '/@/hooks/component/useGridLayout';
   import { ColEx } from '/@/components/Form/src/types';
@@ -184,7 +187,6 @@
       if (props.attr) {
         method.setFieldsValue({ keys: props.attr });
         const attrInfo = unref(deviceAttrs).find((item) => item.identifier === props.attr);
-        console.log({ attrInfo });
         if (
           [DataTypeEnum.IS_STRING, DataTypeEnum.IS_STRUCT].includes(
             attrInfo?.detail.dataType.type as unknown as DataTypeEnum
@@ -198,7 +200,7 @@
     } catch (error) {}
   };
 
-  const openHistoryPanel = async (orderBy?: string) => {
+  const openHistoryPanel = async (orderBy = OrderByEnum.ASC) => {
     await nextTick();
     method.updateSchema({
       field: 'keys',

@@ -32,13 +32,14 @@ export function useHistoryData() {
   };
 
   function getSearchParams(value: Partial<Record<SchemaFiled, string>>) {
-    const { startTs, endTs, interval, agg, limit, keys, way, deviceId } = value;
+    const { startTs, endTs, interval, agg, limit, keys, way, deviceId, orderBy } = value;
     const basicRecord = {
       entityId: deviceId,
       keys: keys ? keys : unref(getDeviceKeys).join(),
       interval,
       agg,
       limit,
+      orderBy,
     };
     if (way === QueryWay.LATEST) {
       return Object.assign(basicRecord, {

@@ -21,6 +21,16 @@ export enum SchemaFiled {
   ORDER_BY = 'orderBy',
 }
 
+export enum OrderByEnum {
+  DESC = 'DESC',
+  ASC = 'ASC',
+}
+
+export enum OrderByNameEnum {
+  DESC = '降序',
+  ASC = '升序',
+}
+
 export enum AggregateDataEnum {
   MIN = 'MIN',
   MAX = 'MAX',
@@ -31,6 +41,18 @@ export enum AggregateDataEnum {
 }
 export const defaultSchemas: FormSchema[] = [
   {
+    field: SchemaFiled.ORDER_BY,
+    label: '数据排序',
+    component: 'Select',
+    defaultValue: OrderByEnum.ASC,
+    componentProps: {
+      options: Object.values(OrderByEnum).map((value) => ({
+        value,
+        label: OrderByNameEnum[value],
+      })),
+    },
+  },
+  {
     field: SchemaFiled.WAY,
     label: '查询方式',
     component: 'RadioGroup',

@@ -8,6 +8,7 @@ import {
   getPacketIntervalByValue,
   intervalOption,
 } from '/@/views/device/localtion/cpns/TimePeriodForm/helper';
+import { OrderByEnum, OrderByNameEnum } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
 export enum QueryWay {
   LATEST = 'latest',
   TIME_PERIOD = 'timePeriod',
@@ -38,6 +39,18 @@ export enum AggregateDataEnum {
 export const formSchema = (): FormSchema[] => {
   return [
     {
+      field: SchemaFiled.ORDER_BY,
+      label: '数据排序',
+      component: 'Select',
+      defaultValue: OrderByEnum.ASC,
+      componentProps: {
+        options: Object.values(OrderByEnum).map((value) => ({
+          value,
+          label: OrderByNameEnum[value],
+        })),
+      },
+    },
+    {
       field: SchemaFiled.DEVICE_ID,
       label: '设备名称',
       component: 'Select',

@@ -22,6 +22,7 @@
   import { ModalParamsType } from '/#/utils';
   import { WidgetDataType } from '../../hooks/useDataSource';
   import { ExtraDataSource } from '../../types';
+  import { OrderByEnum } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
 
   type DeviceOption = Record<'label' | 'value' | 'organizationId', string>;
 
@@ -211,6 +212,7 @@
       endTs: Date.now(),
       agg: AggregateDataEnum.NONE,
       limit: 7,
+      orderBy: OrderByEnum.ASC,
     });
     historyData.value = getTableHistoryData(res);
     // 判断对象是否为空