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

fix: 修改看板告警数据不正确问题

See merge request yunteng/thingskit-front!759

@@ -90,6 +90,7 @@
   watch(
     () => alarmForm?.value,
     () => {
+      if (props.config.option.mode == 'SELECT_PREVIEW') return;
       send?.(JSON.stringify(getMessage(unref(currentCmdId), unref(getDesign), unref(alarmForm))));
     },
     { immediate: false }

@@ -131,7 +131,6 @@ export const formSchemas = (): FormSchema[] => {
                   deviceProfileId,
                   deviceType,
                 });
-                console.log(data, 'data');
                 if (data)
                   return data.map((item) => ({
                     ...item,

@@ -133,6 +133,7 @@
   watch(
     () => alarmForm?.value,
     () => {
+      if (props.config.option.mode == 'SELECT_PREVIEW') return;
       send?.(JSON.stringify(getMessage(unref(currentCmdId), unref(getDesign), unref(alarmForm))));
     },
     { immediate: false }

+// isRealTime是否是实时
+
 export const getMessage = (cmdId, getDesign, alarmForm) => {
   const entityList = [...new Set(getDesign.dataSource?.map((item) => item.id))];
   const message = {
@@ -26,6 +28,8 @@ export const getMessage = (cmdId, getDesign, alarmForm) => {
               direction: 'DESC',
             },
             timeWindow: alarmForm?.time,
+            startTs: alarmForm?.startTs ? new Date(alarmForm?.startTs).getTime() : undefined,
+            endTs: alarmForm?.endTs ? new Date(alarmForm?.endTs).getTime() : undefined,
           },
           alarmFields: [
             {

@@ -140,7 +140,7 @@
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
       series.value.forEach((item) => {
-        if (item.id == deviceId && item.attribute === attribute) {
+        if (item.id == deviceId && item.attribute === attribute && value) {
           item.value = getNumberValue(value);
         }
       });

@@ -142,7 +142,7 @@
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
       series.value.forEach((item) => {
-        if (item.id == deviceId && item.attribute === attribute) {
+        if (item.id == deviceId && item.attribute === attribute && value) {
           item.value = getNumberValue(value);
         }
         time.value = timespan;

 <script lang="ts" setup>
-  import { ref, unref } from 'vue';
-  import { AggregateDataEnum, formSchema, QueryWay, SchemaFiled } from './config';
+  import { formSchema, SchemaFiled } from './config';
   import { useForm } from '/@/components/Form';
   import { useModalInner } from '/@/components/Modal';
   import { useGridLayout } from '/@/hooks/component/useGridLayout';
@@ -8,81 +7,13 @@
   import { BasicForm } from '/@/components/Form';
   import { BasicModal } from '/@/components/Modal';
   import { nextTick } from 'vue';
-  import {
-    getPacketIntervalByRange,
-    getPacketIntervalByValue,
-  } from '/@/views/device/localtion/cpns/TimePeriodForm/helper';
-
   const emit = defineEmits(['register', 'getAlarmForm', 'getHistoryForm']);
   // const emit = defineEmits<{
   //   (event: 'getAlarmForm', data: WidgetDataType): void;
   // }>();
 
-  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 fontId = ref('');
+  const [registerModal, { closeModal }] = useModalInner(async () => {});
 
   const [register, method] = useForm({
     schemas: formSchema(),
@@ -103,12 +34,12 @@
   };
   const handleSubmit = async () => {
     const values = method.getFieldsValue();
-    if (unref(fontId) == 'StatisticsComponent7') {
-      emit('getHistoryForm', values);
-    } else {
-      emit('getAlarmForm', values);
-    }
+    // if (unref(fontId) == 'StatisticsComponent7') {
+    //   emit('getHistoryForm', values);
+    // } else {
 
+    // }
+    emit('getAlarmForm', values);
     await nextTick();
     closeModal();
   };

@@ -3,12 +3,14 @@ import { Ref, inject, provide } from 'vue';
 const SymbolKey = Symbol('alarm-info');
 interface IAlarm {
   pageSize: number;
-  time: string | number;
+  time?: string | number;
+  startTs?: string | number;
+  endTs?: string | number;
 }
 
 export interface AlarmContextType {
   alarmForm: Ref<IAlarm>;
-  getAlarmForm: (value: any) => void;
+  getAlarmForm?: (value: any) => void;
 }
 
 export const createAlarmContext = (options: AlarmContextType) => {

@@ -82,36 +82,48 @@
     openAlarmModal(true, { mode: DataActionModeEnum.READ, record: data } as ModalParamsType);
   };
 
-  const alarmForm = ref({
+  const alarmForm = ref<{
+    time?: number | string;
+    pageSize: number;
+    startTs?: number | string;
+    endTs?: string | number;
+  }>({
     time: 2592000000,
-    pageSize: 10,
+    pageSize: 20,
+    startTs: undefined,
+    endTs: undefined,
   });
 
   //告警发送数据
   const getAlarmForm = (values) => {
     const { way, pageSize, startTs, endTs } = values;
-    if (way == 'timePeriod')
+    if (way == 'timePeriod') {
       alarmForm.value = {
-        time: new Date(endTs).getTime() - new Date(startTs).getTime(),
+        time: undefined,
+        startTs,
+        endTs,
         pageSize,
       };
-    else
+    } else
       alarmForm.value = {
         time: startTs,
         pageSize,
+        startTs: undefined,
+        endTs: undefined,
       };
   };
-  createAlarmContext({ alarmForm: alarmForm, getAlarmForm });
+  createAlarmContext({ alarmForm: alarmForm });
 
   // 历史数据发送
   const historyForm = ref({
-    startTs: 2592000000,
-    endTs: undefined,
+    startTs: Date.now() - 30 * 24 * 60 * 60 * 1000,
+    endTs: Date.now(),
     agg: 'NONE',
-    limit: null,
+    limit: 30,
     interval: undefined,
     way: 'latest',
   });
+
   const getHistoryForm = (values) => {
     const { startTs, endTs, agg, limit, interval, way } = values;
     historyForm.value = {
@@ -122,7 +134,10 @@
       interval,
       way,
     };
-    console.log(values);
+    if (way === 'latest') {
+      historyForm.value.startTs = Date.now() - startTs;
+      historyForm.value.endTs = Date.now();
+    }
   };
   createHistoryContext({ historyForm: historyForm, getHistoryForm });
 
@@ -219,12 +234,8 @@
     <!-- 趋势 -->
     <HistoryTrendModal @register="registerTrendModal" />
 
-    <!-- 告警选择时间 -->
-    <AlarmTimeModal
-      @register="registerAlarmModal"
-      @getAlarmForm="getAlarmForm"
-      @getHistoryForm="getHistoryForm"
-    />
+    <!-- 选择时间 -->
+    <AlarmTimeModal @register="registerAlarmModal" @getAlarmForm="getAlarmForm" />
   </section>
 </template>