Merge remote-tracking branch 'origin/main_dev' into main_dev

@@ -51,6 +51,7 @@ export interface ModelOfMatterParams {
   callType?: string;
   eventType?: string;
   accessMode?: string;
+  extensionDesc?: Recordable;
 }
 
 export interface GetModelTslParams {

@@ -39,6 +39,8 @@ import CustomMinMaxInput from './externalCompns/components/CustomMinMaxInput.vue
 import StructForm from './externalCompns/components/StructForm/StructForm.vue';
 import ApiSelectScrollLoad from './components/ApiSelectScrollLoad.vue';
 import InputGroup from './components/InputGroup.vue';
+import RegisterAddressInput from '/@/views/task/center/components/PollCommandInput/RegisterAddressInput.vue';
+import ExtendDesc from '/@/components/Form/src/externalCompns/components/ExtendDesc/index.vue';
 
 const componentMap = new Map<ComponentType, Component>();
 
@@ -85,6 +87,8 @@ componentMap.set('CustomMinMaxInput', CustomMinMaxInput);
 componentMap.set('StructForm', StructForm);
 componentMap.set('ApiSelectScrollLoad', ApiSelectScrollLoad);
 componentMap.set('InputGroup', InputGroup);
+componentMap.set('RegisterAddressInput', RegisterAddressInput);
+componentMap.set('ExtendDesc', ExtendDesc);
 
 export function add(compName: ComponentType, component: Component) {
   componentMap.set(compName, component);

+<script lang="ts" setup>
+  import { Button } from 'ant-design-vue';
+  import { nextTick, ref, watch } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { BasicModal } from '/@/components/Modal';
+
+  const show = ref(false);
+
+  const props = withDefaults(
+    defineProps<{
+      value?: object;
+      disabled?: boolean;
+    }>(),
+    {
+      value: () => ({}),
+    }
+  );
+
+  const emit = defineEmits(['update:value']);
+
+  const [registerForm, { setFieldsValue, getFieldsValue, setProps }] = useForm({
+    schemas: [
+      {
+        field: 'registerAddress',
+        component: 'Input',
+        label: '寄存器地址',
+        componentProps: {
+          placeholder: '请输入寄存器地址',
+        },
+      },
+    ],
+    showActionButtonGroup: false,
+  });
+
+  const handleClick = async () => {
+    show.value = true;
+    await nextTick();
+    setProps({ disabled: props.disabled });
+    setFieldsValue(props.value);
+  };
+
+  const handleSubmit = () => {
+    const value = getFieldsValue();
+    emit('update:value', value);
+    show.value = false;
+  };
+
+  watch(
+    () => props.value,
+    (value) => {
+      setFieldsValue(value);
+    }
+  );
+</script>
+
+<template>
+  <section>
+    <Button type="link" @click="handleClick">新增扩展描述</Button>
+    <BasicModal title="扩展描述" v-model:visible="show" @ok="handleSubmit">
+      <BasicForm @register="registerForm" />
+    </BasicModal>
+  </section>
+</template>

@@ -28,7 +28,7 @@ export const validateJSON = (_rule, value = [] as ModelOfMatterParams[], _callba
   return Promise.reject('JSON对象不能为空');
 };
 
-export const formSchemas = (hasStructForm: boolean): FormSchema[] => {
+export const formSchemas = (hasStructForm: boolean, isTcp = false): FormSchema[] => {
   return [
     {
       field: FormField.FUNCTION_NAME,
@@ -276,6 +276,27 @@ export const formSchemas = (hasStructForm: boolean): FormSchema[] => {
       ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_STRING,
     },
     {
+      field: FormField.EXTENSION_DESC,
+      component: 'ExtendDesc',
+      label: '扩展描述',
+      valueField: 'value',
+      changeEvent: 'update:value',
+      rules: [
+        {
+          message: '请输入扩展描述',
+          required: true,
+          validator(_rule, value, _callback) {
+            if (!value?.['registerAddress']) return Promise.reject('请输入寄存器地址');
+            return Promise.resolve();
+          },
+        },
+      ],
+      ifShow: isTcp,
+      colProps: {
+        span: 16,
+      },
+    },
+    {
       field: FormField.ACCESS_MODE,
       component: 'ApiRadioGroup',
       label: '读写类型',

@@ -129,4 +129,5 @@ export type ComponentType =
   | 'RegisterAddressInput'
   | 'ControlGroup'
   | 'JSONEditor'
-  | 'OrgTreeSelect';
+  | 'OrgTreeSelect'
+  | 'ExtendDesc';

@@ -67,7 +67,7 @@ export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
 
       if (items.length) {
         const first = items.at(0)!;
-        const { deviceName, id, severity } = first;
+        const { deviceName, id, severity, type } = first;
 
         let key: Nullable<string> = `open-notify-${id}`;
 
@@ -82,6 +82,10 @@ export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
               h('span', { style: { marginRight: '5px' } }, '设备:'),
               h('span', {}, `[${deviceName}]`),
             ]),
+            h('div', { style: { marginRight: '5px' } }, [
+              h('span', { style: { marginRight: '5px' } }, '告警场景:'),
+              h('span', {}, `[${type}]`),
+            ]),
             h('div', { style: { marginTop: '5px' } }, [
               h('span', { style: { marginRight: '5px' } }, '告警状态:'),
               h(Tag, { color }, () => `${alarmNotifyStatusMean}`),

@@ -109,6 +109,15 @@
         unref(DeviceStep1Ref)?.resetFields();
         unref(DeviceStep2Ref)?.resetFieldsValueAndStatus();
       }
+      //验证设备名称不能超过255长度
+      const MAX_NAME_LENGTH = 255;
+      const validateNameLength = (name: string) => {
+        if (String(name).length > MAX_NAME_LENGTH) {
+          const errorText = `设备名称长度不能超过${MAX_NAME_LENGTH}`;
+          createMessage.error(errorText);
+          throw Error(errorText);
+        }
+      };
       // 提交
       const msg = computed(() => (unref(isUpdate) ? '更新设备成功' : '新增设备成功'));
       async function handleOk() {
@@ -150,6 +159,7 @@
                 ...DeviceStep1Ref.value?.positionState,
               },
             };
+            validateNameLength(stepRecord.name);
             await createOrEditDevice(editData);
           } else {
             const stepRecord = unref(stepState);
@@ -178,6 +188,7 @@
                           : null,
                     },
             };
+            validateNameLength(stepRecord.name);
             await createOrEditDevice(createData);
           }
           createMessage.success(unref(msg));

@@ -30,6 +30,7 @@
         <Attribute
           v-if="activeKey === FunctionType.PROPERTIES"
           :openModalMode="openModalMode"
+          :transportType="record.transportType"
           ref="AttrRef"
         />
         <Service

@@ -13,12 +13,13 @@
   import { isArray } from 'lodash';
   import { OpenModelMode } from '../types';
   import { formSchemas } from '/@/components/Form/src/externalCompns/components/StructForm/config';
+  import { TransportTypeEnum } from '../../../../components/TransportDescript/const';
 
-  defineProps<{ openModalMode: OpenModelMode }>();
+  const props = defineProps<{ openModalMode: OpenModelMode; transportType: string }>();
 
   const [register, { validate, resetFields, setFieldsValue, setProps }] = useForm({
     labelWidth: 100,
-    schemas: formSchemas(false),
+    schemas: formSchemas(false, props.transportType === TransportTypeEnum.TCP),
     actionColOptions: {
       span: 14,
     },
@@ -37,13 +38,13 @@
     const { functionName, remark, identifier, accessMode } = _values;
     const structJSON = transfromToStructJSON(_values);
     const dataType = excludeIdInStructJSON(structJSON.dataType!);
-
     const value = {
       functionName,
       functionType: FunctionType.PROPERTIES,
       remark,
       identifier,
       accessMode,
+      extensionDesc: _values.extensionDesc,
       functionJson: {
         dataType: dataType,
       },
@@ -67,7 +68,6 @@
       ...dataType,
       ...(isArray(specs) ? specs : { ...specs }),
     };
-
     setFieldsValue(value);
   };
 

@@ -24,7 +24,8 @@ export enum FormField {
   EVENT_TYPE = 'eventType',
   SERVICE_COMMAND = 'serviceCommand',
   ACCESS_MODE = 'accessMode',
-
+  REGISTER_ADDRESS = 'registerAddress',
+  EXTENSION_DESC = 'extensionDesc',
   STRUCT = 'struct',
 }
 

@@ -107,7 +107,6 @@
           v-else
           v-model:value="scriptForm.output"
           placeholder="输出参数为服务端返回的内容"
-          :maxlength="255"
         />
       </a-form-item>
     </a-form>

@@ -48,6 +48,11 @@ export const aceEditorOptions = {
   enableEmmet: true,
 };
 
+const scriptTypeInfo = {
+  TRANSPORT_TCP_UP: '上行数据解析',
+  TRANSPORT_TCP_AUTH: '设备鉴权',
+};
+
 // 表格配置
 export const columns: BasicColumn[] = [
   {
@@ -68,6 +73,14 @@ export const columns: BasicColumn[] = [
     slots: { customRender: 'convertJs' },
   },
   {
+    title: '脚本类型',
+    dataIndex: 'scriptType',
+    width: 120,
+    format: (values) => {
+      return scriptTypeInfo[values];
+    },
+  },
+  {
     title: '备注',
     dataIndex: 'description',
     width: 120,

@@ -138,7 +138,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     required: true,
     componentProps: {
-      maxLength: 255,
+      maxLength: 100,
     },
   },
 

@@ -3,7 +3,7 @@
   import { ComponentType, ColEx } from '/@/components/Form/src/types/index';
   import { computed } from '@vue/reactivity';
   import { isFunction } from '/@/utils/is';
-  import { unref } from 'vue';
+  import { toRaw, unref } from 'vue';
   import { watch } from 'vue';
   import { nextTick } from 'vue';
   import { ref } from 'vue';
@@ -48,17 +48,13 @@
     }
   );
 
-  const getProps = computed(() => {
-    return props;
-  });
-
   const batchSetValue = (value: any): ValueItemType[] => {
-    const { length } = unref(getProps);
+    const { length } = props;
     return Array.from({ length }, () => ({ value }));
   };
 
   const getTotalControlItem = computed(() => {
-    const { totalControlProps, component, showTotalControl } = unref(getProps);
+    const { totalControlProps, component, showTotalControl } = props;
     return {
       ...totalControlProps,
       field: FormFieldsEnum.TOTAL_CONTROL,
@@ -72,12 +68,12 @@
     } as FormSchema;
   });
 
-  const getSchemas = computed(() => {
-    const { itemProps, itemLabel, length, component } = unref(getProps);
+  const getSchemas = () => {
+    const { itemProps, itemLabel, length, component } = props;
     let label = isFunction(itemLabel) ? itemLabel : (index: number) => `#${index}`;
     let _itemProps = isFunction(itemProps) ? itemProps : () => ({});
     const schemas = Array.from(
-      { length },
+      { length: props.length },
       (_item, index) =>
         ({
           ..._itemProps(index),
@@ -93,14 +89,14 @@
         } as FormSchema)
     );
 
-    length && schemas.unshift(unref(getTotalControlItem));
+    length && schemas.unshift(toRaw(getTotalControlItem.value));
 
     return schemas;
-  });
+  };
 
   const [registerForm, { getFieldsValue, setProps, setFieldsValue }] = useForm({
     showActionButtonGroup: false,
-    schemas: unref(getSchemas),
+    schemas: toRaw(unref(getSchemas())),
     // baseColProps,
     baseColProps: props.itemColProps,
   });
@@ -111,19 +107,16 @@
       return;
     }
     const allValue = getFieldsValue();
-    const sortKeyList = Array.from({ length: unref(getProps).length }, (_v, key) => key);
+    const sortKeyList = Array.from({ length: props.length }, (_v, key) => key);
     const res = sortKeyList.map((item) => ({ value: allValue[item] } as ValueItemType));
 
     emit(EmitEventEnum.UPDATE_VALUE, res);
   };
 
   const transformValue = (value: ValueItemType[]) => {
-    const { length } = unref(getProps);
+    const { length } = props;
     if (value.length !== length) {
-      value = Array.from(
-        { length: unref(getProps).length },
-        () => ({ value: null } as ValueItemType)
-      );
+      value = Array.from({ length: props.length }, () => ({ value: null } as ValueItemType));
     }
     return value.reduce((prev, next, index) => ({ ...prev, [index]: next.value }), {});
   };
@@ -153,13 +146,11 @@
 
   watch(
     () => [props.length, props.component],
-    (target) => {
-      if (target !== undefined || target !== null) {
-        setProps({
-          schemas: unref(getSchemas),
-        });
-        handleUpdateValue();
-      }
+    () => {
+      setProps({
+        schemas: toRaw(unref(getSchemas())),
+      });
+      handleUpdateValue();
     }
   );
 

 <script lang="ts" setup>
   import { InputGroup, InputNumber, Select, Input } from 'ant-design-vue';
-  import { unref } from 'vue';
+  import { unref, watch } from 'vue';
   import { computed } from 'vue';
   import { ref } from 'vue';
 
@@ -13,10 +13,11 @@
 
   const DEC_MAX_VALUE = parseInt('0xffff', 16);
 
-  withDefaults(
+  const props = withDefaults(
     defineProps<{
       value?: number | string;
       inputProps?: Recordable;
+      disabled?: boolean;
     }>(),
     {
       value: 0,
@@ -31,7 +32,7 @@
 
   const type = ref(AddressTypeEnum.DEC);
 
-  const inputValue = ref<number | string>(0);
+  const inputValue = ref<number | string>(props.value);
 
   const getHexValue = computed(() => {
     return parseInt(unref(inputValue) || 0, 16);
@@ -61,6 +62,14 @@
     inputValue.value = syncValue;
     emit('update:value', toDEC(syncValue));
   };
+
+  const stop = watch(
+    () => props.value,
+    (value) => {
+      inputValue.value = value;
+      stop();
+    }
+  );
 </script>
 
 <template>
@@ -69,6 +78,7 @@
       v-model:value="type"
       :options="addressTypeOptions"
       @change="handleChange"
+      :disabled="disabled"
       class="bg-gray-200 max-w-20"
     />
     <InputNumber
@@ -76,6 +86,7 @@
       v-model:value="inputValue"
       :step="1"
       class="flex-1"
+      :disabled="disabled"
       v-bind="inputProps"
       @change="handleEmit"
     />

@@ -178,7 +178,7 @@ export const formSchemas: FormSchema[] = [
     changeEvent: 'update:value',
     ifShow: ({ model }) => showCoilValue(model[FormFieldsEnum.METHOD]),
     defaultValue: '0',
-    rules: [{ required: true, message: '请输入线圈值' }],
+    rules: [{ required: true, message: '请输入线圈值', type: 'number' }],
     componentProps: {
       placeholder: '请输入线圈值',
     },
@@ -191,7 +191,7 @@ export const formSchemas: FormSchema[] = [
     changeEvent: 'update:value',
     ifShow: ({ model }) => showRegisterValue(model[FormFieldsEnum.METHOD]),
     defaultValue: '0',
-    rules: [{ required: true, message: '请输入寄存器值' }],
+    rules: [{ required: true, message: '请输入寄存器值', type: 'number' }],
     componentProps: {
       placeholder: '请输入寄存器值',
     },

@@ -41,7 +41,7 @@ export const composeModbusModalData = (record: ModbusCommandValueType): GenModbu
   return {
     crc,
     deviceCode,
-    method,
+    method: Number(method).toString(16).padStart(2, '0'),
     registerAddr,
     ...registerInfo(record),
   };

@@ -15,6 +15,7 @@ export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.OPEN_COLOR]: '#00F43D',
   [ComponentConfigFieldEnum.CLOSE_COLOR]: '#FF0000',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: true,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
 };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -30,6 +30,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showTime,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -10,6 +10,7 @@
   import { ReceiveAlarmDataCmdsMessageType } from '../../../hook/socket/useSocket.type';
   import { useDataBoardContext } from '/@/views/visual/palette/hooks/useDataBoardContext';
   import { useAlarmContext } from '/@/views/visual/palette/hooks/useAlarmTime';
+  import { getMessage } from '../config';
 
   interface IStatus {
     text: string;
@@ -20,6 +21,7 @@
     id: string;
     deviceName: string;
     showDeviceName: boolean;
+    showTime: boolean;
     status: IStatus;
     time: number;
   }
@@ -51,7 +53,7 @@
   const getDesign = computed(() => {
     const { persetOption = {}, option } = props.config;
     const { dataSource } = option;
-    const { showDeviceName: presetShowDeviceName } = persetOption;
+    const { showDeviceName: presetShowDeviceName, showTime: persetShowTime } = persetOption;
 
     return {
       dataSource: dataSource?.map((item) => {
@@ -60,6 +62,7 @@
           id: deviceId,
           deviceName: deviceRename || deviceName,
           showDeviceName: componentInfo.showDeviceName ?? presetShowDeviceName,
+          showTime: componentInfo.showTime ?? persetShowTime,
         };
       }),
     };
@@ -71,67 +74,6 @@
     }, 4000);
   };
 
-  // 发送websocket的格式
-  const getMessage = (cmdId: number) => {
-    const message = {
-      alarmDataCmds: [
-        {
-          query: {
-            entityFilter: {
-              type: 'entityList',
-              resolveMultiple: true,
-              entityType: 'DEVICE',
-              entityList: unref(getDesign).dataSource?.map((item) => item.id),
-            },
-            pageLink: {
-              page: 0,
-              pageSize: unref(alarmForm)?.pageSize,
-              textSearch: null,
-              searchPropagatedAlarms: false,
-              statusList: [],
-              severityList: [],
-              typeList: [],
-              sortOrder: {
-                key: {
-                  key: 'createdTime',
-                  type: 'ALARM_FIELD',
-                },
-                direction: 'DESC',
-              },
-              timeWindow: unref(alarmForm)?.time,
-            },
-            alarmFields: [
-              {
-                type: 'ALARM_FIELD',
-                key: 'createdTime',
-              },
-              {
-                type: 'ALARM_FIELD',
-                key: 'originator',
-              },
-              {
-                type: 'ALARM_FIELD',
-                key: 'type',
-              },
-              {
-                type: 'ALARM_FIELD',
-                key: 'severity',
-              },
-              {
-                type: 'ALARM_FIELD',
-                key: 'status',
-              },
-            ],
-            entityFields: [],
-            latestValues: [],
-          },
-          cmdId,
-        },
-      ],
-    };
-    return message;
-  };
-
   const alarmStatusList = ref<IAlarmStatusList[]>([
     {
       id: '1',
@@ -139,6 +81,7 @@
       status: { text: '紧急', color: 'alarm_state_major' },
       time: 1689574726,
       showDeviceName: true,
+      showTime: true,
     },
   ]);
 
@@ -147,14 +90,15 @@
   watch(
     () => alarmForm?.value,
     () => {
-      send?.(JSON.stringify(getMessage(unref(currentCmdId))));
+      send?.(JSON.stringify(getMessage(unref(currentCmdId), unref(getDesign), unref(alarmForm))));
     },
     { immediate: false }
   );
 
   const transformMessage = (cmdId: number) => {
+    if (props.config.option.mode == 'SELECT_PREVIEW') return;
     currentCmdId.value = cmdId;
-    send?.(JSON.stringify(getMessage(cmdId)));
+    send?.(JSON.stringify(getMessage(cmdId, unref(getDesign), unref(alarmForm))));
   };
 
   const getReduce = (data) => {
@@ -185,6 +129,7 @@
         id: item.id,
         deviceName: item.deviceName,
         showDeviceName: item.showDeviceName,
+        showTime: item.showTime,
         status: { text: '', color: '' },
         time: 0,
       };
@@ -215,23 +160,20 @@
 
 <template>
   <main :style="getScale" class="w-full h-full flex justify-center items-center">
-    <!-- <DeviceName :config="config" class="text-center" /> -->
-    <div
-      v-for="item in alarmStatusList"
-      :key="item.id"
-      class="flex flex-col justify-center items-center"
-    >
-      <div class="text-gray-500 text-sm truncate"
-        >{{
-          item.status.text
-            ? item.showDeviceName
-              ? item.deviceName + '-'
-              : ''
-            : '当前设备未发现告警'
-        }}{{ item.status.text }}</div
-      >
-      <div :class="item.status.color"></div>
-      <UpdateTime :time="item.time" />
+    <div v-for="item in alarmStatusList" :key="item.id" class="flex flex-col items-center">
+      <div class="flex justify-center items-center flex-col">
+        <div class="text-gray-500 text-sm truncate"
+          >{{
+            item.status.text
+              ? item.showDeviceName
+                ? item.deviceName + '-'
+                : ''
+              : '当前设备未发现告警'
+          }}{{ item.status.text }}</div
+        >
+        <div :class="item.status.color"></div>
+      </div>
+      <UpdateTime v-show="item.showTime" :time="item.time" />
     </div>
   </main>
 </template>

@@ -2,16 +2,16 @@ import { FormSchema } from '/@/components/Form';
 import { DataSourceField } from '../../../config/common.config';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { getDeviceProfile } from '/@/api/alarm/position';
-import { useSelectWidgetMode } from '/@/views/visual/dataSourceBindPanel/useContext';
-import { DataActionModeEnum } from '/@/enums/toolEnum';
-import { unref } from 'vue';
+// import { getDeviceProfile } from '/@/api/alarm/position';
+// import { useSelectWidgetMode } from '/@/views/visual/dataSourceBindPanel/useContext';
+// import { DataActionModeEnum } from '/@/enums/toolEnum';
+// import { unref } from 'vue';
 import { getMeetTheConditionsDevice } from '/@/api/dataBoard';
 import { MasterDeviceList } from '/@/api/dataBoard/model';
 
 export const formSchemas = (): FormSchema[] => {
-  const mode = useSelectWidgetMode();
-  const isUpdate = unref(mode) === DataActionModeEnum.UPDATE;
+  // const mode = useSelectWidgetMode();
+  // const isUpdate = unref(mode) === DataActionModeEnum.UPDATE;
   return [
     {
       field: DataSourceField.DEVICE_NAME,
@@ -49,41 +49,41 @@ export const formSchemas = (): FormSchema[] => {
         };
       },
     },
-    {
-      field: DataSourceField.DEVICE_PROFILE_ID,
-      component: 'ApiSelect',
-      label: '产品',
-      colProps: { span: 8 },
-      rules: [{ required: true, message: '产品为必填项' }],
-      componentProps: ({ formActionType, formModel }) => {
-        const { setFieldsValue } = formActionType;
-        const deviceType = formModel[DataSourceField.DEVICE_TYPE];
-        return {
-          api: async () => {
-            if (!deviceType) return [];
-            const list = await getDeviceProfile(deviceType);
-            if (isUpdate) {
-              const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
-              const record = list.find((item) => item.id === deviceProfileId);
-              setFieldsValue({ [DataSourceField.TRANSPORT_TYPE]: record?.transportType });
-            }
-            return list;
-          },
-          labelField: 'name',
-          valueField: 'id',
-          placeholder: '请选择产品',
-          onChange: (_, option = {} as Record<'transportType', string>) => {
-            setFieldsValue({
-              [DataSourceField.DEVICE_ID]: null,
-              [DataSourceField.ATTRIBUTE]: null,
-              [DataSourceField.ATTRIBUTE_NAME]: null,
-              [DataSourceField.TRANSPORT_TYPE]: option[DataSourceField.TRANSPORT_TYPE],
-            });
-          },
-          getPopupContainer: () => document.body,
-        };
-      },
-    },
+    // {
+    //   field: DataSourceField.DEVICE_PROFILE_ID,
+    //   component: 'ApiSelect',
+    //   label: '产品',
+    //   colProps: { span: 8 },
+    //   rules: [{ required: true, message: '产品为必填项' }],
+    //   componentProps: ({ formActionType, formModel }) => {
+    //     const { setFieldsValue } = formActionType;
+    //     const deviceType = formModel[DataSourceField.DEVICE_TYPE];
+    //     return {
+    //       api: async () => {
+    //         if (!deviceType) return [];
+    //         const list = await getDeviceProfile(deviceType);
+    //         if (isUpdate) {
+    //           const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
+    //           const record = list.find((item) => item.id === deviceProfileId);
+    //           setFieldsValue({ [DataSourceField.TRANSPORT_TYPE]: record?.transportType });
+    //         }
+    //         return list;
+    //       },
+    //       labelField: 'name',
+    //       valueField: 'id',
+    //       placeholder: '请选择产品',
+    //       onChange: (_, option = {} as Record<'transportType', string>) => {
+    //         setFieldsValue({
+    //           [DataSourceField.DEVICE_ID]: null,
+    //           [DataSourceField.ATTRIBUTE]: null,
+    //           [DataSourceField.ATTRIBUTE_NAME]: null,
+    //           [DataSourceField.TRANSPORT_TYPE]: option[DataSourceField.TRANSPORT_TYPE],
+    //         });
+    //       },
+    //       getPopupContainer: () => document.body,
+    //     };
+    //   },
+    // },
     {
       field: DataSourceField.ORIGINATION_ID,
       component: 'OrgTreeSelect',
@@ -131,6 +131,7 @@ export const formSchemas = (): FormSchema[] => {
                   deviceProfileId,
                   deviceType,
                 });
+                console.log(data, 'data');
                 if (data)
                   return data.map((item) => ({
                     ...item,

@@ -128,66 +128,6 @@
     };
   });
 
-  // const getMessage = (cmdId: number) => {
-  //   const message = {
-  //     alarmDataCmds: [
-  //       {
-  //         query: {
-  //           entityFilter: {
-  //             type: 'entityList',
-  //             resolveMultiple: true,
-  //             entityType: 'DEVICE',
-  //             entityList: unref(getDesign).dataSource?.map((item) => item.id),
-  //           },
-  //           pageLink: {
-  //             page: 0,
-  //             pageSize: unref(alarmForm)?.pageSize,
-  //             textSearch: null,
-  //             searchPropagatedAlarms: false,
-  //             statusList: [],
-  //             severityList: [],
-  //             typeList: [],
-  //             sortOrder: {
-  //               key: {
-  //                 key: 'createdTime',
-  //                 type: 'ALARM_FIELD',
-  //               },
-  //               direction: 'DESC',
-  //             },
-  //             timeWindow: unref(alarmForm)?.time,
-  //           },
-  //           alarmFields: [
-  //             {
-  //               type: 'ALARM_FIELD',
-  //               key: 'createdTime',
-  //             },
-  //             {
-  //               type: 'ALARM_FIELD',
-  //               key: 'originator',
-  //             },
-  //             {
-  //               type: 'ALARM_FIELD',
-  //               key: 'type',
-  //             },
-  //             {
-  //               type: 'ALARM_FIELD',
-  //               key: 'severity',
-  //             },
-  //             {
-  //               type: 'ALARM_FIELD',
-  //               key: 'status',
-  //             },
-  //           ],
-  //           entityFields: [],
-  //           latestValues: [],
-  //         },
-  //         cmdId,
-  //       },
-  //     ],
-  //   };
-  //   return message;
-  // };
-
   const { alarmForm } = useAlarmContext();
 
   watch(
@@ -199,8 +139,8 @@
   );
 
   const transformMessage = (cmdId: number) => {
+    if (props.config.option.mode == 'SELECT_PREVIEW') return;
     currentCmdId.value = cmdId;
-
     send?.(JSON.stringify(getMessage(cmdId, unref(getDesign), unref(alarmForm))));
   };
 

@@ -44,7 +44,6 @@
   ]);
 
   const getDesign = computed(() => {
-    console.log(props.config.option, 'option');
     const { persetOption = {}, option } = props.config;
     const { dataSource = [] } = option || {};
     const {
@@ -75,7 +74,6 @@
 
   const { loading, sendCommand } = useSendCommand();
   const handleChange = async (index: number, checked: Boolean) => {
-    console.log(props.config.option);
     const { heightPx, itemHeightRatio, itemWidthRatio, mode, widthPx, dataSource } =
       props.config.option;
 
@@ -87,7 +85,6 @@
       mode,
       widthPx,
     } as DataSource;
-    console.log(data, 'data', checked);
 
     const flag = await sendCommand(data, checked);
     if (!flag) controlList.value[index].checked = !checked;
@@ -105,10 +102,7 @@
   );
 
   const updateFn: MultipleDataFetchUpdateFn = async (message, deviceId, attribute) => {
-    console.log(unref(getDesign).dataSource, 'dataSource');
-
-    forEachGroupMessage(message, deviceId, attribute, (attribute, value, time) => {
-      console.log(attribute, value, time);
+    forEachGroupMessage(message, deviceId, attribute, (attribute, value) => {
       controlList.value.forEach((item) => {
         if (item.id === deviceId && item.attribute === attribute) {
           item.checked = Boolean(getNumberValue(value));

@@ -13,7 +13,7 @@ export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
   [ComponentConfigFieldEnum.UNIT]: 'm',
   [ComponentConfigFieldEnum.FONT_COLOR]: '#fff',
-  [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
   [ComponentConfigFieldEnum.FLOWMETER_CONFIG]: {
     [ComponentConfigFieldEnum.BACKGROUND_COLOR]: '#8badcb',
     [ComponentConfigFieldEnum.WAVE_FIRST]: '#4579e2',

@@ -55,6 +55,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showDeviceName,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -5,6 +5,6 @@ const componentKeys = useComponentKeys('CircleFlowmeter');
 
 export const CircleFlowmeterConfig: ConfigType = {
   ...componentKeys,
-  title: '流量计2',
+  title: '计量计2',
   package: PackagesCategoryEnum.FLOWMETER,
 };

@@ -20,12 +20,13 @@
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
     const { componentInfo, attribute, attributeName, attributeRename } = option;
-    const { flowmeterConfig, unit, fontColor } = componentInfo || {};
+    const { flowmeterConfig, unit, fontColor, showTime } = componentInfo || {};
     const { backgroundColor, waveFirst, waveSecond, waveThird } = flowmeterConfig || {};
     const {
       flowmeterConfig: presetFlowmeterConfig,
       unit: persetUnit,
       fontColor: presetFontColor,
+      showTime: persetShowTime,
     } = persetOption || {};
     const {
       backgroundColor: presetBackgroundColor,
@@ -41,6 +42,7 @@
       unit: unit ?? persetUnit,
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -76,7 +78,10 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center relative">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center relative"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <svg
       class="waves-rect"
@@ -121,7 +126,7 @@
     <div class="text-gray-500 text-sm truncate" style="flex: 0 0 20px">{{
       getDesign.attribute || '属性'
     }}</div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
 </template>
 

@@ -11,6 +11,7 @@ import { ComponentConfigFieldEnum } from '/@/views/visual/packages/enum';
 
 export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
   [ComponentConfigFieldEnum.UNIT]: 'm',
   [ComponentConfigFieldEnum.FLOWMETER_CONFIG]: {
     [ComponentConfigFieldEnum.BACKGROUND_COLOR]: '#8badcb',

@@ -55,6 +55,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showTime,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -5,6 +5,6 @@ const componentKeys = useComponentKeys('RectFlowmeter');
 
 export const RectFlowmeteConfig: ConfigType = {
   ...componentKeys,
-  title: '流量计1',
+  title: '计量计1',
   package: PackagesCategoryEnum.FLOWMETER,
 };

@@ -20,12 +20,13 @@
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
     const { componentInfo, attribute, attributeName, attributeRename } = option;
-    const { flowmeterConfig, unit, fontColor } = componentInfo || {};
+    const { flowmeterConfig, unit, fontColor, showTime } = componentInfo || {};
     const { backgroundColor, waveFirst, waveSecond, waveThird } = flowmeterConfig || {};
     const {
       flowmeterConfig: presetFlowmeterConfig,
       unit: persetUnit,
       fontColor: presetFontColor,
+      showTime: persetShowTime,
     } = persetOption || {};
     const {
       backgroundColor: presetBackgroundColor,
@@ -41,6 +42,7 @@
       unit: unit ?? persetUnit,
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -66,7 +68,10 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center relative">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center relative"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <svg
       class="waves-rect"
@@ -114,7 +119,7 @@
     <div class="text-gray-500 text-sm truncate" style="flex: 0 0 20px">{{
       getDesign.attribute || '属性'
     }}</div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
 </template>
 

@@ -12,6 +12,7 @@ import { ComponentConfigFieldEnum } from '/@/views/visual/packages/enum';
 export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.FONT_COLOR]: '#',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
 };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -19,6 +19,11 @@
         label: '显示设备名称',
         component: 'Checkbox',
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -37,12 +37,13 @@
 
   const getDesign = computed(() => {
     const { persetOption, option } = props.config;
-    const { fontColor: presetFontColor } = persetOption || {};
+    const { fontColor: presetFontColor, showTime: persetShowTime } = persetOption || {};
     const { componentInfo, attribute, attributeName, attributeRename } = option || {};
-    const { fontColor } = componentInfo || {};
+    const { fontColor, showTime } = componentInfo || {};
     return {
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -59,7 +60,10 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center relative">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center relative"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <svg class="flowmeter-thermometer" viewBox="0 0 200 250" xmlns="http://www.w3.org/2000/svg">
       <defs>
@@ -256,7 +260,7 @@
     <div class="text-gray-500 text-sm truncate" style="flex: 0 0 20px">{{
       getDesign.attribute || '属性'
     }}</div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
 </template>
 

@@ -13,6 +13,7 @@ export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.FONT_COLOR]: '#000',
   [ComponentConfigFieldEnum.UNIT]: 'kw/h',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
 };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -28,6 +28,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showDeviceName,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -48,12 +48,17 @@
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
     const { componentInfo, attribute, attributeRename, attributeName } = option;
-    const { fontColor: presetFontColor, unit: presetUnit } = persetOption || {};
-    const { unit, fontColor } = componentInfo || {};
+    const {
+      fontColor: presetFontColor,
+      unit: presetUnit,
+      showTime: persetShowTime,
+    } = persetOption || {};
+    const { unit, fontColor, showTime } = componentInfo || {};
     return {
       unit: unit ?? presetUnit,
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -71,7 +76,10 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <div class="flex flex-col w-full h-full">
       <DeviceName class="text-center" :config="config" />
 
@@ -134,7 +142,7 @@
         <span>{{ getDesign.attribute || '电表' }}</span>
       </div>
 
-      <UpdateTime :time="time" />
+      <UpdateTime v-show="getDesign.showTime" :time="time" />
     </div>
   </main>
 </template>

@@ -22,6 +22,7 @@ export enum GradientColor {
 export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.FONT_COLOR]: '#FD7347',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
   [ComponentConfigFieldEnum.UNIT]: '℃',
   [ComponentConfigFieldEnum.POINTER_COLOR]: '#15E2C6',
   [ComponentConfigFieldEnum.INSTRUMENT_PANEL_COLOR]: '#61D4C5',

@@ -22,18 +22,18 @@
         defaultValue: option.fontColor,
       },
       {
-        field: ComponentConfigFieldEnum.UNIT,
-        label: '数值单位',
-        component: 'Input',
-        defaultValue: option.unit,
-      },
-      {
         field: ComponentConfigFieldEnum.POINTER_COLOR,
         label: '指针颜色',
         component: 'ColorPicker',
         changeEvent: 'update:value',
         defaultValue: option.pointerColor,
       },
+      {
+        field: ComponentConfigFieldEnum.UNIT,
+        label: '数值单位',
+        component: 'Input',
+        defaultValue: option.unit,
+      },
       // {
       //   field: ComponentConfigFieldEnum.INSTRUMENT_PANEL_WIDTH,
       //   label: '仪表盘宽度',
@@ -48,6 +48,13 @@
         defaultValue: option.showDeviceName,
       },
       {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showTime,
+      },
+
+      {
         field: ComponentConfigFieldEnum.FIRST_PHASE_COLOR,
         label: '起始颜色',
         component: 'ColorPicker',
@@ -88,13 +95,14 @@
       fontColor: item[ComponentConfigFieldEnum.FONT_COLOR],
       unit: item[ComponentConfigFieldEnum.UNIT],
       showDeviceName: item[ComponentConfigFieldEnum.SHOW_DEVICE_NAME],
+      showTime: item[ComponentConfigFieldEnum.SHOW_TIME],
       pointerColor: item[ComponentConfigFieldEnum.POINTER_COLOR],
     } as ComponentInfo;
   };
 
   const setFormValues = (data: Recordable) => {
     // return setFieldsValue(data);
-    const { gradientInfo, unit, fontColor, showDeviceName, pointerColor } = data;
+    const { gradientInfo, unit, fontColor, showDeviceName, pointerColor, showTime } = data;
     const firstRecord = gradientInfo.find((item) => item.key === Gradient.FIRST);
     const secondRecord = gradientInfo.find((item) => item.key === Gradient.SECOND);
 
@@ -102,6 +110,7 @@
       [ComponentConfigFieldEnum.UNIT]: unit,
       [ComponentConfigFieldEnum.FONT_COLOR]: fontColor,
       [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: showDeviceName,
+      [ComponentConfigFieldEnum.SHOW_TIME]: showTime,
       [ComponentConfigFieldEnum.FIRST_PHASE_VALUE]: 0,
       [ComponentConfigFieldEnum.FIRST_PHASE_COLOR]: firstRecord?.color,
       [ComponentConfigFieldEnum.SECOND_PHASE_VALUE]: 1,

@@ -30,8 +30,9 @@
       pointerColor: presetPointerColor,
       instrumentPanelColor: presetInstrumentPanelColor,
       gradientInfo: presetGradientInfo,
+      showTime: persetShowTime,
     } = persetOption || {};
-    const { unit, fontColor, pointerColor, instrumentPanelColor, gradientInfo } =
+    const { unit, fontColor, pointerColor, instrumentPanelColor, gradientInfo, showTime } =
       componentInfo || {};
     return {
       unit: unit ?? presetUnit,
@@ -40,6 +41,7 @@
       pointerColor: pointerColor ?? presetPointerColor,
       instrumentPanelColor: instrumentPanelColor ?? presetInstrumentPanelColor,
       gradientInfo: gradientInfo ?? presetGradientInfo,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -204,12 +206,15 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
     <div class="text-gray-500 text-xs text-center truncate">{{
       getDesign.attribute || '湿度'
     }}</div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-if="getDesign.showTime" :time="time" />
   </main>
 </template>

@@ -20,6 +20,7 @@ export enum GradientColor {
 export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.FONT_COLOR]: '#FD7347',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
   [ComponentConfigFieldEnum.PROGRESS_BAR_CIRCLE]: false,
   [ComponentConfigFieldEnum.UNIT]: '℃',
   [ComponentConfigFieldEnum.POINTER_COLOR]: '#15E2C6',

@@ -22,18 +22,6 @@
         defaultValue: option.fontColor,
       },
       {
-        field: ComponentConfigFieldEnum.UNIT,
-        label: '数值单位',
-        component: 'Input',
-        defaultValue: option.unit,
-      },
-      {
-        field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
-        label: '显示设备名称',
-        component: 'Checkbox',
-        defaultValue: option.showDeviceName,
-      },
-      {
         field: ComponentConfigFieldEnum.PROGRESS_BAR_CIRCLE,
         label: '显示进度条圆形',
         component: 'Checkbox',
@@ -53,6 +41,24 @@
         changeEvent: 'update:value',
         defaultValue: GradientColor.SECOND,
       },
+      {
+        field: ComponentConfigFieldEnum.UNIT,
+        label: '数值单位',
+        component: 'Input',
+        defaultValue: option.unit,
+      },
+      {
+        field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
+        label: '显示设备名称',
+        component: 'Checkbox',
+        defaultValue: option.showDeviceName,
+      },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showTime,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,
@@ -80,13 +86,14 @@
       fontColor: item[ComponentConfigFieldEnum.FONT_COLOR],
       unit: item[ComponentConfigFieldEnum.UNIT],
       showDeviceName: item[ComponentConfigFieldEnum.SHOW_DEVICE_NAME],
+      showTime: item[ComponentConfigFieldEnum.SHOW_TIME],
       progressBarCircle: item[ComponentConfigFieldEnum.PROGRESS_BAR_CIRCLE],
     } as ComponentInfo;
   };
 
   const setFormValues = (data: Recordable) => {
     // return setFieldsValue(data);
-    const { gradientInfo, unit, fontColor, showDeviceName, progressBarCircle } = data;
+    const { gradientInfo, unit, fontColor, showDeviceName, progressBarCircle, showTime } = data;
     const firstRecord = gradientInfo.find((item) => item.key === Gradient.FIRST);
     const secondRecord = gradientInfo.find((item) => item.key === Gradient.SECOND);
 
@@ -94,6 +101,7 @@
       [ComponentConfigFieldEnum.UNIT]: unit,
       [ComponentConfigFieldEnum.FONT_COLOR]: fontColor,
       [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: showDeviceName,
+      [ComponentConfigFieldEnum.SHOW_TIME]: showTime,
       [ComponentConfigFieldEnum.FIRST_PHASE_VALUE]: 0,
       [ComponentConfigFieldEnum.FIRST_PHASE_COLOR]: firstRecord?.color,
       [ComponentConfigFieldEnum.SECOND_PHASE_VALUE]: 1,

@@ -31,9 +31,17 @@
       instrumentPanelColor: presetInstrumentPanelColor,
       progressBarCircle: presetProgressBarCircle,
       gradientInfo: presetGradientInfo,
+      showTime: persetShowTime,
     } = persetOption || {};
-    const { unit, fontColor, pointerColor, gradientInfo, progressBarCircle, instrumentPanelColor } =
-      componentInfo || {};
+    const {
+      unit,
+      fontColor,
+      pointerColor,
+      gradientInfo,
+      progressBarCircle,
+      instrumentPanelColor,
+      showTime,
+    } = componentInfo || {};
     return {
       unit: unit ?? presetUnit,
       fontColor: fontColor ?? presetFontColor,
@@ -42,6 +50,7 @@
       instrumentPanelColor: instrumentPanelColor ?? presetInstrumentPanelColor,
       progressBarCircle: progressBarCircle ?? presetProgressBarCircle,
       gradientInfo: gradientInfo ?? presetGradientInfo,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -206,12 +215,15 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
     <div class="text-gray-500 text-xs text-center truncate">{{
       getDesign.attribute || '湿度'
     }}</div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-if="getDesign.showTime" :time="time" />
   </main>
 </template>

@@ -3,7 +3,7 @@
   import { unref, ref, onMounted, computed, nextTick } from 'vue';
   import { ComponentPropsConfigType } from '../../../index.type';
   import { option } from './config';
-  import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
+  // import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
   import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
   import { useComponentScale } from '/@/views/visual/packages/hook/useComponentScale';
   import { useReceiveMessage } from '../../../hook/useReceiveMessage';
@@ -19,7 +19,7 @@
 
   const chartInstance = ref<Nullable<ECharts>>(null);
 
-  const time = ref<Nullable<number>>(null);
+  // const time = ref<Nullable<number>>(null);
 
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
@@ -276,11 +276,11 @@
   const { forEachGroupMessage } = useReceiveMessage();
   const { getNumberValue } = useReceiveValue();
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
-    forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
+    forEachGroupMessage(message, deviceId, attribute, (attribute, value) => {
       series.value.forEach((item) => {
         if (item.id === deviceId && item.attribute === attribute) {
           item.value = getNumberValue(value);
-          time.value = timespan;
+          // time.value = timespan;
         }
       });
     });
@@ -334,6 +334,6 @@
   <main class="w-full h-full flex flex-col justify-center items-center">
     <DeviceName :config="config" />
     <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
-    <UpdateTime :time="time" />
+    <!-- <UpdateTime :time="time" /> -->
   </main>
 </template>

@@ -20,7 +20,8 @@ export enum GradientColor {
 export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.FONT_COLOR]: '#FD7347',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
-  [ComponentConfigFieldEnum.UNIT]: '℃',
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
+  [ComponentConfigFieldEnum.UNIT]: 'kw',
 };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -26,6 +26,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showTime,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,
@@ -41,17 +47,19 @@
       fontColor: item[ComponentConfigFieldEnum.FONT_COLOR],
       unit: item[ComponentConfigFieldEnum.UNIT],
       showDeviceName: item[ComponentConfigFieldEnum.SHOW_DEVICE_NAME],
+      showTime: item[ComponentConfigFieldEnum.SHOW_TIME],
     } as ComponentInfo;
   };
 
   const setFormValues = (data: Recordable) => {
     // return setFieldsValue(data);
-    const { unit, fontColor, showDeviceName } = data;
+    const { unit, fontColor, showDeviceName, showTime } = data;
 
     const value = {
       [ComponentConfigFieldEnum.UNIT]: unit,
       [ComponentConfigFieldEnum.FONT_COLOR]: fontColor,
       [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: showDeviceName,
+      [ComponentConfigFieldEnum.SHOW_TIME]: showTime,
     };
     return setFieldsValue(value);
   };

@@ -29,8 +29,9 @@
       pointerColor: presetPointerColor,
       instrumentPanelColor: presetInstrumentPanelColor,
       gradientInfo: presetGradientInfo,
+      showTime: persetShowTime,
     } = persetOption || {};
-    const { unit, fontColor, pointerColor, instrumentPanelColor, gradientInfo } =
+    const { unit, fontColor, pointerColor, instrumentPanelColor, gradientInfo, showTime } =
       componentInfo || {};
     return {
       unit: unit ?? presetUnit,
@@ -39,6 +40,7 @@
       pointerColor: pointerColor ?? presetPointerColor,
       instrumentPanelColor: instrumentPanelColor ?? presetInstrumentPanelColor,
       gradientInfo: gradientInfo ?? presetGradientInfo,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -189,12 +191,15 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
     <div class="text-gray-500 text-xs text-center truncate">{{
-      getDesign.attribute || '湿度'
+      getDesign.attribute || '速度'
     }}</div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-if="getDesign.showTime" :time="time" />
   </main>
 </template>

@@ -12,6 +12,7 @@ import { ComponentConfigFieldEnum } from '../../../enum';
 export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.FONT_COLOR]: '#FD7347',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
   [ComponentConfigFieldEnum.UNIT]: '℃',
 };
 

@@ -25,6 +25,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showTime,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -27,12 +27,17 @@
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
     const { componentInfo, attribute, attributeRename, attributeName } = option;
-    const { fontColor: presetFontColor, unit: presetUnit } = persetOption || {};
-    const { unit, fontColor } = componentInfo || {};
+    const {
+      fontColor: presetFontColor,
+      unit: presetUnit,
+      showTime: persetShowTime,
+    } = persetOption || {};
+    const { unit, fontColor, showTime } = componentInfo || {};
     return {
       unit: unit ?? presetUnit,
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
+      showTime: persetShowTime || showTime,
     };
   });
 
@@ -222,12 +227,15 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
     <div class="text-gray-500 text-xs text-center truncate">{{
       getDesign.attribute || '温度'
     }}</div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
 </template>

@@ -29,6 +29,7 @@ export const option: PublicPresetOptions = {
   ],
   [ComponentConfigFieldEnum.UNIT]: 'km/h',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
 };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -81,6 +81,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showTime,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,
@@ -112,11 +118,12 @@
       fontColor: value[ComponentConfigFieldEnum.FONT_COLOR],
       unit: value[ComponentConfigFieldEnum.UNIT],
       showDeviceName: value[ComponentConfigFieldEnum.SHOW_DEVICE_NAME],
+      showTime: value[ComponentConfigFieldEnum.SHOW_TIME],
     } as ComponentInfo;
   };
 
   const setFormValues = (data: ComponentInfo) => {
-    const { gradientInfo, unit, fontColor, showDeviceName } = data;
+    const { gradientInfo, unit, fontColor, showDeviceName, showTime } = data;
     const firstRecord = gradientInfo.find((item) => item.key === Gradient.FIRST);
     const secondRecord = gradientInfo.find((item) => item.key === Gradient.SECOND);
     const thirdRecord = gradientInfo.find((item) => item.key === Gradient.THIRD);
@@ -124,6 +131,7 @@
       [ComponentConfigFieldEnum.UNIT]: unit,
       [ComponentConfigFieldEnum.FONT_COLOR]: fontColor,
       [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: showDeviceName,
+      [ComponentConfigFieldEnum.SHOW_TIME]: showTime,
       [ComponentConfigFieldEnum.FIRST_PHASE_VALUE]: firstRecord?.value,
       [ComponentConfigFieldEnum.FIRST_PHASE_COLOR]: firstRecord?.color,
       [ComponentConfigFieldEnum.SECOND_PHASE_VALUE]: secondRecord?.value,

@@ -36,14 +36,16 @@
       fontColor: presetFontColor,
       unit: presetUnit,
       gradientInfo: presetGradientInfo,
+      showTime: persetShowTime,
     } = persetOption || {};
 
-    const { unit, fontColor, gradientInfo } = componentInfo || {};
+    const { unit, fontColor, gradientInfo, showTime } = componentInfo || {};
     return {
       unit: unit ?? presetUnit,
       fontColor: fontColor ?? presetFontColor,
       gradientInfo: gradientInfo ?? presetGradientInfo,
       attribute: attributeRename || attributeName || attribute,
+      showTime: showTime || persetShowTime,
     };
   });
 
@@ -205,12 +207,15 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
     <div class="text-center text-gray-500 text-xs truncate">
       {{ getDesign.attribute || '速度' }}
     </div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
 </template>

@@ -13,6 +13,7 @@ export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.OPEN_COLOR]: '#30f230',
   [ComponentConfigFieldEnum.CLOSE_COLOR]: '#eeeeee',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: true,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
 };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -25,10 +25,10 @@
         },
       },
       {
-        field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
-        label: '显示设备名称',
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
         component: 'Checkbox',
-        defaultValue: option.showDeviceName,
+        defaultValue: option.showTime,
       },
     ],
     showActionButtonGroup: false,

@@ -24,15 +24,17 @@
       openColor: persetOpenColor,
       closeColor: persetCloseColor,
       showDeviceName: persetShowDeviceName,
+      showTime: persetShowTime,
     } = persetOption || {};
     const { componentInfo, attribute, attributeName, attributeRename } = option;
 
-    const { openColor, closeColor, showDeviceName } = componentInfo || {};
+    const { openColor, closeColor, showDeviceName, showTime } = componentInfo || {};
     return {
       openColor: openColor ?? persetOpenColor,
       closeColor: closeColor ?? persetCloseColor,
       showDeviceName: showDeviceName ?? persetShowDeviceName,
       attribute: attributeRename || attributeName || attribute,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -60,10 +62,14 @@
 </script>
 
 <template>
-  <main :style="getScale" class="w-full h-full flex flex-col justify-center items-center">
+  <main
+    :style="getScale"
+    class="w-full h-full flex flex-col justify-center items-center"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" class="text-center" />
 
-    <div class="flex-1 flex justify-center items-center flex-col">
+    <div class="flex-1 flex justify-center items-center flex-col" :style="getScale">
       <div
         :style="{
           '--open-color': getDesign.openColor,
@@ -73,7 +79,7 @@
       ></div>
       <div class="text-gray-500 text-sm truncate">{{ getDesign.attribute }}</div>
     </div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-if="getDesign.showTime" :time="time" />
   </main>
 </template>
 <style lang="less" scoped>

@@ -15,6 +15,7 @@ export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.ICON_CLOSE]: 'dianyuandianya',
   [ComponentConfigFieldEnum.ICON_COLOR_CLOSE]: '#CCCCCC',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
 };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -52,6 +52,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示设备名称',
+        component: 'Checkbox',
+        defaultValue: option.showTime,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -25,11 +25,12 @@
       fontColor: persetFontColor,
       iconClose: persetIconCLose,
       iconColorClose: persetIconColorClose,
+      showTime: persetShowTime,
     } = persetOption;
 
     const { componentInfo, attributeRename } = option;
 
-    const { icon, iconColor, fontColor, unit, iconClose, iconColorClose, attributeName } =
+    const { icon, iconColor, fontColor, unit, iconClose, iconColorClose, attributeName, showTime } =
       componentInfo || {};
     return {
       iconColor: iconColor || persetIconColor,
@@ -39,6 +40,7 @@
       attribute: attributeRename || attributeName,
       iconClose: iconClose || persetIconCLose,
       iconColorClose: iconColorClose || persetIconColorClose,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -67,6 +69,6 @@
       />
       <div class="text-gray-500 text-sm truncate m-2">{{ getDesign.attribute || '温度' }}</div>
     </div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
 </template>

@@ -3,7 +3,7 @@
   import { unref, ref, onMounted, computed, nextTick, toRaw } from 'vue';
   import { ComponentPropsConfigType } from '../../../index.type';
   import { option } from './config';
-  import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
+  // import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
   import { useComponentScale } from '../../../hook/useComponentScale';
   import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
   import { useReceiveMessage } from '../../../hook/useReceiveMessage';
@@ -180,6 +180,6 @@
   <main class="w-full h-full flex flex-col justify-center items-center">
     <DeviceName :config="config" />
     <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
-    <UpdateTime :time="time" />
+    <!-- <UpdateTime :time="time" /> -->
   </main>
 </template>

@@ -3,7 +3,7 @@
   import { unref, ref, onMounted, computed, nextTick, toRaw } from 'vue';
   import { ComponentPropsConfigType } from '../../../index.type';
   import { option } from './config';
-  import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
+  // import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
   import { useComponentScale } from '../../../hook/useComponentScale';
   import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
   import { useReceiveMessage } from '../../../hook/useReceiveMessage';
@@ -181,6 +181,6 @@
   <main class="w-full h-full flex flex-col justify-center items-center">
     <DeviceName :config="config" />
     <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
-    <UpdateTime :time="time" />
+    <!-- <UpdateTime :time="time" /> -->
   </main>
 </template>

@@ -3,7 +3,7 @@
   import { unref, ref, onMounted, nextTick, toRaw, computed } from 'vue';
   import { ComponentPropsConfigType } from '../../../index.type';
   import { option } from './config';
-  import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
+  // import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
   import { useComponentScale } from '../../../hook/useComponentScale';
   import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
   import { useIntervalFn } from '@vueuse/core';
@@ -21,10 +21,10 @@
   const chartRefEl = ref<Nullable<HTMLDivElement>>(null);
 
   const chartInstance = ref<Nullable<ECharts>>(null);
-  const time = ref<Nullable<number>>(null);
+  // const time = ref<Nullable<number>>(null);
 
   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 legendData = ref<string[]>(['温度']);
@@ -51,7 +51,7 @@
       grid: {
         top: '30%',
         left: '6%',
-        right: '16%',
+        right: '10%',
         bottom: '1%',
         containLabel: true,
       },
@@ -91,7 +91,6 @@
     return {
       dataSource: dataSource?.map((item) => {
         const { unit, showDeviceName, fontColor } = item.componentInfo || {};
-        console.log(item, 'item');
         const { attribute, attributeRename, deviceId, attributeName, deviceName, deviceRename } =
           item;
         return {
@@ -203,6 +202,6 @@
   <main class="w-full h-full flex flex-col justify-center items-center">
     <DeviceName :config="config" />
     <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
-    <UpdateTime :time="time" />
+    <!-- <UpdateTime :time="time" /> -->
   </main>
 </template>

@@ -3,7 +3,6 @@
   import { ComponentPropsConfigType } from '../../../index.type';
   import { Progress } from 'ant-design-vue';
   import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
-  import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
   import { useReceiveMessage } from '../../../hook/useReceiveMessage';
   import { buildUUID } from '/@/utils/uuid';
   import { useReceiveValue } from '../../../hook/useReceiveValue';
@@ -127,7 +126,7 @@
         <Progress :strokeColor="item.backgroundColor" :percent="item.value" :showInfo="false" />
       </div>
     </div>
-    <UpdateTime :time="time" />
+    <!-- <UpdateTime :time="time" /> -->
   </main>
 </template>
 <style lang="less" scoped>

@@ -3,7 +3,6 @@
   import { option } from './config';
   import { ref, unref } from 'vue';
   import { SvgIcon } from '/@/components/Icon';
-  import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
   import { computed } from 'vue';
   import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
   import { useReceiveMessage } from '../../../hook/useReceiveMessage';
@@ -118,6 +117,6 @@
         <span>{{ item.unit }} </span>
       </h1>
     </div>
-    <UpdateTime :time="time" />
+    <!-- <UpdateTime :time="time" /> -->
   </main>
 </template>

@@ -19,6 +19,7 @@ export enum ComponentConfigFieldEnum {
   SECOND_PHASE_VALUE = 'secondPhaseValue',
   THIRD_PHASE_VALUE = 'thirdPhaseValue',
   SHOW_DEVICE_NAME = 'showDeviceName',
+  SHOW_TIME = 'showTime',
   GRADIENT_INFO = 'gradientInfo',
 
   FLOWMETER_CONFIG = 'flowmeterConfig',

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

@@ -19,7 +19,7 @@ export enum PackagesCategoryNameEnum {
   // PICTURE = '图片组件',
   CONTROL = '控制组件',
   MAP = '地图组件',
-  FLOWMETER = '流量计',
+  FLOWMETER = '计量计',
   STATISTICS = '统计',
   ALARM = '告警',
   OTHER = '其他',

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

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

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

 <script lang="ts" setup>
   import { ref, unref } from 'vue';
-  import { formSchema, SchemaFiled } from './config';
+  import { AggregateDataEnum, formSchema, QueryWay, SchemaFiled } from './config';
   import { useForm } from '/@/components/Form';
   import { useModalInner } from '/@/components/Modal';
   import { useGridLayout } from '/@/hooks/component/useGridLayout';
@@ -8,13 +8,81 @@
   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']);
+  const emit = defineEmits(['register', 'getAlarmForm', 'getHistoryForm']);
   // const emit = defineEmits<{
   //   (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({
     schemas: formSchema(),
@@ -33,21 +101,14 @@
   const handleCancel = () => {
     // destory()
   };
-  const alarmForm = ref({ time: 2592000000, pageSize: 10 }); //默认30天
   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 {
-      alarmForm.value = {
-        time: startTs,
-        pageSize,
-      };
+      emit('getAlarmForm', values);
     }
-    emit('getAlarmForm', unref(alarmForm));
+
     await nextTick();
     closeModal();
   };

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

@@ -25,13 +25,14 @@
   import { ModalParamsType } from '/#/utils';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
   import { HistoryTrendModal } from './components/HistoryTrendModal';
-  import { alarmTimeModal } from './components/alarmTimeModal';
+  import { AlarmTimeModal } from './components/AlarmTimeModal';
   import { watch } from 'vue';
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
   import { ThemeEnum } from '/@/enums/appEnum';
   import { createDataBoardContext } from './hooks/useDataBoardContext';
   import { useSocket } from '/@/views/visual/packages/hook/socket/useSocket';
   import { createAlarmContext } from './hooks/useAlarmTime';
+  import { createHistoryContext } from './hooks/useHistoryForm';
 
   const props = defineProps<{
     value?: Recordable;
@@ -85,15 +86,46 @@
     time: 2592000000,
     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 });
 
+  // 历史数据发送
+  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);
 
   createDataBoardContext({ send, close });
@@ -188,7 +220,11 @@
     <HistoryTrendModal @register="registerTrendModal" />
 
     <!-- 告警选择时间 -->
-    <alarmTimeModal @register="registerAlarmModal" @getAlarmForm="getAlarmForm" />
+    <AlarmTimeModal
+      @register="registerAlarmModal"
+      @getAlarmForm="getAlarmForm"
+      @getHistoryForm="getHistoryForm"
+    />
   </section>
 </template>
 

@@ -53,6 +53,7 @@ export interface ComponentInfo {
   icon: string;
   iconColor: string;
   showDeviceName: boolean;
+  showTime?: boolean;
   gradientInfo: ComponentInfoGradientInfoType[];
   flowmeterConfig: FlowmeterConfigType;
   pointerColor?: string;

@@ -85,7 +85,7 @@
             class="mt-4"
             v-for="temp in item.items"
             :key="temp.key"
-            @click="handleSelected(temp)"
+            @click.capture="handleSelected(temp)"
             :class="temp.key === props.checked?.componentKey ? '!border-2 !border-blue-500' : ''"
           >
             <component :is="componentMap.get(temp.key)" v-bind="getBindConfig(temp.key)" />