Merge branch 'main' into local_dev_ft

+import { EventManageRequest } from './model/eventManageModel';
+import { defHttp } from '/@/utils/http/axios';
+enum EventManage {
+  LIST = '/event',
+}
+
+/**
+ * @description 获取事件管理列表
+ * @param params
+ * @returns
+ */
+export const getEventManageListRecord = (params: EventManageRequest) => {
+  return defHttp.get({
+    url: EventManage.LIST,
+    params,
+  });
+};

@@ -177,6 +177,8 @@ export interface DeviceRecord {
   default: boolean;
   default: boolean;
   defaultRuleChainId: string;
   defaultRuleChainId: string;
   profileId: string;
   profileId: string;
+  alias?: string;
+  brand?: string;
 }
 }
 
 
 export interface DeviceModelOfMatterAttrs {
 export interface DeviceModelOfMatterAttrs {

+import { BasicPageParams } from '../../model/baseModel';
+
+export interface EventManageRequest extends BasicPageParams {
+  eventIdentifier?: string;
+  eventType?: string;
+  tbDeviceId: string;
+  startTime?: string;
+  endTime?: string;
+}

@@ -49,7 +49,7 @@
       <!-- 网关设备并且是TBox -->
       <!-- 网关设备并且是TBox -->
 
 
       <TabPane key="eventManage" tab="事件管理">
       <TabPane key="eventManage" tab="事件管理">
-        <EventManage />
+        <EventManage :tbDeviceId="deviceDetail.tbDeviceId" />
       </TabPane>
       </TabPane>
     </Tabs>
     </Tabs>
   </BasicDrawer>
   </BasicDrawer>
@@ -70,6 +70,7 @@
   // import HistoryData from '../tabs/HistoryData.vue';
   // import HistoryData from '../tabs/HistoryData.vue';
   import ModelOfMatter from '../tabs/ModelOfMatter.vue';
   import ModelOfMatter from '../tabs/ModelOfMatter.vue';
   import EventManage from '../tabs/EventManage/index.vue';
   import EventManage from '../tabs/EventManage/index.vue';
+  import { DeviceRecord } from '/@/api/device/model/deviceModel';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'DeviceModal',
     name: 'DeviceModal',
@@ -93,7 +94,7 @@
       const activeKey = ref('1');
       const activeKey = ref('1');
       const size = ref('small');
       const size = ref('small');
       const deviceDetailRef = ref();
       const deviceDetailRef = ref();
-      const deviceDetail = ref<any>({});
+      const deviceDetail = ref<DeviceRecord>({} as unknown as DeviceRecord);
       const tbDeviceId = ref('');
       const tbDeviceId = ref('');
       // 详情回显
       // 详情回显
       const [register] = useDrawerInner(async (data) => {
       const [register] = useDrawerInner(async (data) => {

@@ -8,7 +8,7 @@ export const columnSchema: BasicColumn[] = [
   },
   },
   {
   {
     title: '标识符',
     title: '标识符',
-    dataIndex: 'identifier',
+    dataIndex: 'eventIdentifier',
     helpMessage: ['标识符格式为模块标识符: 功能定义标识符'],
     helpMessage: ['标识符格式为模块标识符: 功能定义标识符'],
   },
   },
   {
   {
@@ -28,15 +28,17 @@ export const columnSchema: BasicColumn[] = [
 
 
 export const formSchemas: FormSchema[] = [
 export const formSchemas: FormSchema[] = [
   {
   {
-    field: 'identifier',
+    field: 'eventIdentifier',
     label: '标识符',
     label: '标识符',
     component: 'Input',
     component: 'Input',
+    componentProps: {
+      placeholder: '请输入标识符',
+    },
   },
   },
   {
   {
-    field: 'alarmType',
+    field: 'eventType',
     label: '告警类型',
     label: '告警类型',
     component: 'ApiSelect',
     component: 'ApiSelect',
-    defaultValue: 'INFO',
     componentProps: {
     componentProps: {
       placeholder: '请选择事件类型',
       placeholder: '请选择事件类型',
       api: findDictItemByCode,
       api: findDictItemByCode,
@@ -52,5 +54,8 @@ export const formSchemas: FormSchema[] = [
     label: '时间范围',
     label: '时间范围',
     component: 'RangePicker',
     component: 'RangePicker',
     colProps: { span: 10 },
     colProps: { span: 10 },
+    componentProps: {
+      showTime: true,
+    },
   },
   },
 ];
 ];

@@ -2,13 +2,16 @@
   import { BasicTable, useTable } from '/@/components/Table';
   import { BasicTable, useTable } from '/@/components/Table';
   import { formSchemas, columnSchema } from './config';
   import { formSchemas, columnSchema } from './config';
   import { BasicModal, useModal } from '/@/components/Modal';
   import { BasicModal, useModal } from '/@/components/Modal';
-  import { Textarea } from 'ant-design-vue';
+  import { Input } from 'ant-design-vue';
   import { ref } from 'vue';
   import { ref } from 'vue';
-  import { formatToDateTime } from '/@/utils/dateUtil';
   import { EyeOutlined } from '@ant-design/icons-vue';
   import { EyeOutlined } from '@ant-design/icons-vue';
+  import { getEventManageListRecord } from '/@/api/device/eventManage';
+  import { EventManageRequest } from '/@/api/device/model/eventManageModel';
 
 
   const outputData = ref<string>();
   const outputData = ref<string>();
 
 
+  const props = defineProps<{ tbDeviceId: string }>();
+
   const [register] = useTable({
   const [register] = useTable({
     columns: columnSchema,
     columns: columnSchema,
     size: 'small',
     size: 'small',
@@ -16,24 +19,25 @@
     useSearchForm: true,
     useSearchForm: true,
     showTableSetting: true,
     showTableSetting: true,
     bordered: true,
     bordered: true,
-    dataSource: [
-      {
-        time: formatToDateTime(new Date()),
-        identifier: '标识符',
-        eventName: '事件名',
-        eventType: '告警',
-        outputParams: { test: 1 },
-      },
-    ],
+    api: getEventManageListRecord,
+    fetchSetting: {
+      totalField: 'totalElements',
+      listField: 'data',
+    },
     formConfig: {
     formConfig: {
       layout: 'inline',
       layout: 'inline',
       baseColProps: { span: 6 },
       baseColProps: { span: 6 },
       labelWidth: 80,
       labelWidth: 80,
       schemas: formSchemas,
       schemas: formSchemas,
+      fieldMapToTime: [['dateRange', ['startTime', 'endTime']]],
     },
     },
-    handleSearchInfoFn: (params: Recordable) => {
-      // console.log(params);
-      return params;
+    beforeFetch: (params: EventManageRequest) => {
+      return {
+        ...params,
+        startTime: params.startTime ? new Date(params.startTime).getTime() : params.startTime,
+        endTime: params.endTime ? new Date(params.endTime).getTime() : params.endTime,
+        tbDeviceId: props.tbDeviceId,
+      };
     },
     },
   });
   });
 
 
@@ -61,7 +65,7 @@
     </template>
     </template>
   </BasicTable>
   </BasicTable>
   <BasicModal title="输出参数" @register="registerModal">
   <BasicModal title="输出参数" @register="registerModal">
-    <Textarea v-model:value="outputData" :autosize="true" />
+    <Input.TextArea v-model:value="outputData" :autosize="true" />
   </BasicModal>
   </BasicModal>
 </template>
 </template>
 
 

@@ -13,7 +13,7 @@
   import HistoryData from './HistoryData.vue';
   import HistoryData from './HistoryData.vue';
   import { BasicModal, useModal } from '/@/components/Modal';
   import { BasicModal, useModal } from '/@/components/Modal';
   import { getDeviceAttrs } from '/@/api/device/deviceManager';
   import { getDeviceAttrs } from '/@/api/device/deviceManager';
-  import { DeviceModelOfMatterAttrs } from '/@/api/device/model/deviceModel';
+  import { DeviceModelOfMatterAttrs, DeviceRecord } from '/@/api/device/model/deviceModel';
   import { computed } from '@vue/reactivity';
   import { computed } from '@vue/reactivity';
   import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { isArray, isObject } from '/@/utils/is';
   import { isArray, isObject } from '/@/utils/is';
@@ -34,7 +34,7 @@
   }
   }
 
 
   const props = defineProps<{
   const props = defineProps<{
-    deviceDetail: Record<'tbDeviceId' | 'profileId' | 'id' | 'deviceProfileId', string>;
+    deviceDetail: DeviceRecord;
   }>();
   }>();
 
 
   const grid = {
   const grid = {