fix: 修改看板组件告警实时数据的问题

@@ -96,6 +96,7 @@
   );
   );
 
 
   const transformMessage = (cmdId: number) => {
   const transformMessage = (cmdId: number) => {
+    if (props.config.option.mode == 'SELECT_PREVIEW') return;
     currentCmdId.value = cmdId;
     currentCmdId.value = cmdId;
     send?.(JSON.stringify(getMessage(cmdId, unref(getDesign), unref(alarmForm))));
     send?.(JSON.stringify(getMessage(cmdId, unref(getDesign), unref(alarmForm))));
   };
   };

@@ -139,8 +139,8 @@
   );
   );
 
 
   const transformMessage = (cmdId: number) => {
   const transformMessage = (cmdId: number) => {
+    if (props.config.option.mode == 'SELECT_PREVIEW') return;
     currentCmdId.value = cmdId;
     currentCmdId.value = cmdId;
-
     send?.(JSON.stringify(getMessage(cmdId, unref(getDesign), unref(alarmForm))));
     send?.(JSON.stringify(getMessage(cmdId, unref(getDesign), unref(alarmForm))));
   };
   };
 
 

@@ -24,7 +24,7 @@
   // const time = ref<Nullable<number>>(null);
   // const time = ref<Nullable<number>>(null);
 
 
   const updateInterval = ref<number>(1000); //默认每秒更新一次
   const updateInterval = ref<number>(1000); //默认每秒更新一次
-  const maxDataPoints = ref<number>(10); //默认每秒显示10个数据点
+  const maxDataPoints = ref<number>(30); //默认每秒显示10个数据点
 
 
   const chartData = ref<{ time: string | number; value: number }[]>([]);
   const chartData = ref<{ time: string | number; value: number }[]>([]);
   const legendData = ref<string[]>(['温度']);
   const legendData = ref<string[]>(['温度']);
@@ -51,7 +51,7 @@
       grid: {
       grid: {
         top: '30%',
         top: '30%',
         left: '6%',
         left: '6%',
-        right: '16%',
+        right: '10%',
         bottom: '1%',
         bottom: '1%',
         containLabel: true,
         containLabel: true,
       },
       },

@@ -219,7 +219,7 @@ class Subscriber {
           throw error;
           throw error;
         }
         }
       }
       }
-      return;
+      // return;
     }
     }
 
 
     for (const item of subscriptionGroup) {
     for (const item of subscriptionGroup) {

@@ -91,7 +91,11 @@
 
 
   const isAlarm = computed(() => {
   const isAlarm = computed(() => {
     const frontId = props.sourceInfo.frontId;
     const frontId = props.sourceInfo.frontId;
-    if (frontId == 'DeviceAlarm' || frontId == 'DeviceAlarmHistory') {
+    if (
+      frontId == 'DeviceAlarm' ||
+      frontId == 'DeviceAlarmHistory' ||
+      frontId == 'StatisticsComponent7'
+    ) {
       return true;
       return true;
     } else {
     } else {
       return false;
       return false;

@@ -20,7 +20,7 @@ export enum SchemaFiled {
   LIMIT = 'limit',
   LIMIT = 'limit',
   AGG = 'agg',
   AGG = 'agg',
   ORDER_BY = 'orderBy',
   ORDER_BY = 'orderBy',
-  PAGE_SIZe = 'pageSize',
+  PAGE_SIZE = 'pageSize',
 }
 }
 
 
 export enum AggregateDataEnum {
 export enum AggregateDataEnum {
@@ -60,7 +60,7 @@ export const formSchema = (): FormSchema[] => {
     },
     },
 
 
     {
     {
-      field: SchemaFiled.PAGE_SIZe,
+      field: SchemaFiled.PAGE_SIZE,
       label: '分页条数',
       label: '分页条数',
       component: 'InputNumber',
       component: 'InputNumber',
       defaultValue: 20,
       defaultValue: 20,

-export { default as alarmTimeModal } from './index.vue';
+export { default as AlarmTimeModal } from './index.vue';

 <script lang="ts" setup>
 <script lang="ts" setup>
   import { ref, unref } from 'vue';
   import { ref, unref } from 'vue';
-  import { formSchema, SchemaFiled } from './config';
+  import { AggregateDataEnum, formSchema, QueryWay, SchemaFiled } from './config';
   import { useForm } from '/@/components/Form';
   import { useForm } from '/@/components/Form';
   import { useModalInner } from '/@/components/Modal';
   import { useModalInner } from '/@/components/Modal';
   import { useGridLayout } from '/@/hooks/component/useGridLayout';
   import { useGridLayout } from '/@/hooks/component/useGridLayout';
@@ -8,13 +8,81 @@
   import { BasicForm } from '/@/components/Form';
   import { BasicForm } from '/@/components/Form';
   import { BasicModal } from '/@/components/Modal';
   import { BasicModal } from '/@/components/Modal';
   import { nextTick } from 'vue';
   import { nextTick } from 'vue';
+  import {
+    getPacketIntervalByRange,
+    getPacketIntervalByValue,
+  } from '/@/views/device/localtion/cpns/TimePeriodForm/helper';
 
 
-  const emit = defineEmits(['register', 'getAlarmForm']);
+  const emit = defineEmits(['register', 'getAlarmForm', 'getHistoryForm']);
   // const emit = defineEmits<{
   // const emit = defineEmits<{
   //   (event: 'getAlarmForm', data: WidgetDataType): void;
   //   (event: 'getAlarmForm', data: WidgetDataType): void;
   // }>();
   // }>();
 
 
-  const [registerModal, { closeModal }] = useModalInner();
+  const fontId = ref('');
+  const [registerModal, { closeModal }] = useModalInner(async (data) => {
+    fontId.value = unref(data).record.frontId;
+    method.updateSchema([
+      {
+        field: SchemaFiled.PAGE_SIZE,
+        ifShow: unref(fontId) !== 'StatisticsComponent7',
+      },
+    ]);
+    if (unref(fontId) !== 'StatisticsComponent7') return;
+    await nextTick();
+    method.appendSchemaByField(
+      {
+        field: SchemaFiled.AGG,
+        label: '数据聚合功能',
+        component: 'Select',
+        defaultValue: AggregateDataEnum.NONE,
+        componentProps: {
+          getPopupContainer: () => document.body,
+          options: [
+            { label: '最小值', value: AggregateDataEnum.MIN },
+            { label: '最大值', value: AggregateDataEnum.MAX },
+            { label: '平均值', value: AggregateDataEnum.AVG },
+            { label: '求和', value: AggregateDataEnum.SUM },
+            { label: '计数', value: AggregateDataEnum.COUNT },
+            { label: '空', value: AggregateDataEnum.NONE },
+          ],
+        },
+      },
+      SchemaFiled.DATE_RANGE
+    );
+    method.appendSchemaByField(
+      {
+        field: SchemaFiled.INTERVAL,
+        label: '分组间隔',
+        component: 'Select',
+        dynamicRules: ({ model }) => {
+          return [
+            {
+              required: model[SchemaFiled.AGG] !== AggregateDataEnum.NONE,
+              message: '分组间隔为必填项',
+              type: 'number',
+            },
+          ];
+        },
+        ifShow({ values }) {
+          return values[SchemaFiled.AGG] !== AggregateDataEnum.NONE;
+        },
+        componentProps({ formModel, formActionType }) {
+          const options =
+            formModel[SchemaFiled.WAY] === QueryWay.LATEST
+              ? getPacketIntervalByValue(formModel[SchemaFiled.START_TS])
+              : getPacketIntervalByRange(formModel[SchemaFiled.DATE_RANGE]);
+          if (formModel[SchemaFiled.AGG] !== AggregateDataEnum.NONE) {
+            formActionType.setFieldsValue({ [SchemaFiled.LIMIT]: null });
+          }
+          return {
+            options,
+            getPopupContainer: () => document.body,
+          };
+        },
+      },
+      SchemaFiled.AGG
+    );
+  });
 
 
   const [register, method] = useForm({
   const [register, method] = useForm({
     schemas: formSchema(),
     schemas: formSchema(),
@@ -33,21 +101,14 @@
   const handleCancel = () => {
   const handleCancel = () => {
     // destory()
     // destory()
   };
   };
-  const alarmForm = ref({ time: 2592000000, pageSize: 10 }); //默认30天
   const handleSubmit = async () => {
   const handleSubmit = async () => {
-    const { way, pageSize, startTs, endTs } = method.getFieldsValue();
-    if (way == 'timePeriod') {
-      alarmForm.value = {
-        time: new Date(endTs).getTime() - new Date(startTs).getTime(),
-        pageSize,
-      };
+    const values = method.getFieldsValue();
+    if (unref(fontId) == 'StatisticsComponent7') {
+      emit('getHistoryForm', values);
     } else {
     } else {
-      alarmForm.value = {
-        time: startTs,
-        pageSize,
-      };
+      emit('getAlarmForm', values);
     }
     }
-    emit('getAlarmForm', unref(alarmForm));
+
     await nextTick();
     await nextTick();
     closeModal();
     closeModal();
   };
   };

+import { Ref, inject, provide } from 'vue';
+
+const SymbolKey = Symbol('alarm-info');
+interface IHistory {
+  [key: string]: string;
+}
+
+export interface AlarmContextType {
+  historyForm: Ref<IHistory> | any;
+  getHistoryForm: (value: any) => void;
+}
+
+export const createHistoryContext = (options: AlarmContextType) => {
+  provide(SymbolKey, options);
+};
+
+export const useHistoryContext = () => {
+  return inject<AlarmContextType>(SymbolKey) || ({} as Partial<AlarmContextType>);
+};

@@ -25,13 +25,14 @@
   import { ModalParamsType } from '/#/utils';
   import { ModalParamsType } from '/#/utils';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
   import { HistoryTrendModal } from './components/HistoryTrendModal';
   import { HistoryTrendModal } from './components/HistoryTrendModal';
-  import { alarmTimeModal } from './components/alarmTimeModal';
+  import { AlarmTimeModal } from './components/AlarmTimeModal';
   import { watch } from 'vue';
   import { watch } from 'vue';
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
   import { ThemeEnum } from '/@/enums/appEnum';
   import { ThemeEnum } from '/@/enums/appEnum';
   import { createDataBoardContext } from './hooks/useDataBoardContext';
   import { createDataBoardContext } from './hooks/useDataBoardContext';
   import { useSocket } from '/@/views/visual/packages/hook/socket/useSocket';
   import { useSocket } from '/@/views/visual/packages/hook/socket/useSocket';
   import { createAlarmContext } from './hooks/useAlarmTime';
   import { createAlarmContext } from './hooks/useAlarmTime';
+  import { createHistoryContext } from './hooks/useHistoryForm';
 
 
   const props = defineProps<{
   const props = defineProps<{
     value?: Recordable;
     value?: Recordable;
@@ -85,15 +86,46 @@
     time: 2592000000,
     time: 2592000000,
     pageSize: 10,
     pageSize: 10,
   });
   });
-  const getAlarmForm = (value) => {
-    alarmForm.value = {
-      time: value.time,
-      pageSize: value.pageSize,
-    };
-  };
 
 
+  //告警发送数据
+  const getAlarmForm = (values) => {
+    const { way, pageSize, startTs, endTs } = values;
+    if (way == 'timePeriod')
+      alarmForm.value = {
+        time: new Date(endTs).getTime() - new Date(startTs).getTime(),
+        pageSize,
+      };
+    else
+      alarmForm.value = {
+        time: startTs,
+        pageSize,
+      };
+  };
   createAlarmContext({ alarmForm: alarmForm, getAlarmForm });
   createAlarmContext({ alarmForm: alarmForm, getAlarmForm });
 
 
+  // 历史数据发送
+  const historyForm = ref({
+    startTs: 2592000000,
+    endTs: undefined,
+    agg: 'NONE',
+    limit: null,
+    interval: undefined,
+    way: 'latest',
+  });
+  const getHistoryForm = (values) => {
+    const { startTs, endTs, agg, limit, interval, way } = values;
+    historyForm.value = {
+      startTs,
+      endTs,
+      agg,
+      limit,
+      interval,
+      way,
+    };
+    console.log(values);
+  };
+  createHistoryContext({ historyForm: historyForm, getHistoryForm });
+
   const { send, close } = useSocket(dataSource);
   const { send, close } = useSocket(dataSource);
 
 
   createDataBoardContext({ send, close });
   createDataBoardContext({ send, close });
@@ -188,7 +220,11 @@
     <HistoryTrendModal @register="registerTrendModal" />
     <HistoryTrendModal @register="registerTrendModal" />
 
 
     <!-- 告警选择时间 -->
     <!-- 告警选择时间 -->
-    <alarmTimeModal @register="registerAlarmModal" @getAlarmForm="getAlarmForm" />
+    <AlarmTimeModal
+      @register="registerAlarmModal"
+      @getAlarmForm="getAlarmForm"
+      @getHistoryForm="getHistoryForm"
+    />
   </section>
   </section>
 </template>
 </template>