fix

src/pages/weComTask/API/alarmGl/index.ts

@@ -6,6 +6,8 @@ export interface GetCorpPhoneMsgAlarmListProps {
     sysUserId?: number,
     corpUserId?: string,
     corpId?: number,
+    beginTime?: string,
+    endTime?: string
 }
 /**
  * 获取跳转链接列表

src/pages/weComTask/page/alarmGl/index.tsx

@@ -4,7 +4,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import { getCorpPhoneMsgAlarmListApi, GetCorpPhoneMsgAlarmListProps, updateCorpPhoneMsgAlarmApi } from '../../API/alarmGl';
 import { MenuUnfoldOutlined, MenuFoldOutlined, SearchOutlined } from '@ant-design/icons';
 import style from '../corpUserManage/index.less'
-import { App, Button, Card, Pagination, Popconfirm, Select, Table, Tabs, Tag } from 'antd';
+import { App, Button, Card, DatePicker, Pagination, Popconfirm, Select, Table, Tabs, Tag } from 'antd';
 import TeamMembers from '@/components/Team/teamMembers';
 import SearchBox from '../../components/searchBox';
 import { TableConfig } from './tableConfig';
@@ -54,7 +54,7 @@ const AlarmGl: React.FC = () => {
 
     return (
         <div className={style.corpUserManage}>
-            <div className={style.corpUserManage_bottom}>
+            <div className={style.corpUserManage_bottom} style={{ height: '100%' }}>
                 <Card className={style.corpUserList} styles={{ body: { padding: 0, display: 'flex', flexDirection: 'column', height: '100%', overflow: 'hidden' } }}>
                     <SearchBox
                         bodyPadding={`16px 16px 12px`}
@@ -96,6 +96,10 @@ const AlarmGl: React.FC = () => {
                                 }
                                 options={activeCorp?.t2?.map((item: any) => ({ label: item.name, value: item.corpUserId }))}
                             />}
+
+                            <DatePicker.RangePicker allowClear onChange={(dates, dateStrings) => {
+                                setQueryForm({ ...queryForm, beginTime: dateStrings[0], endTime: dateStrings[1], pageNum: 1 })
+                            }} />
                         </>
                     </SearchBox>
 
@@ -105,10 +109,11 @@ const AlarmGl: React.FC = () => {
                             dataSource={getCorpPhoneMsgAlarmList?.data?.data?.records}
                             loading={getCorpPhoneMsgAlarmList?.loading}
                             columns={TableConfig(handleMsg)}
-                            scroll={{ y: size?.height && ref.current ? size?.height - ref.current.querySelector('.ant-table-thead').clientHeight - 38 : 300 }}
+                            scroll={{ y: size?.height && ref.current ? size?.height : 300 }}
                             rowKey={(s) => {
                                 return s.id
                             }}
+                            bordered
                             size='small'
                             pagination={false}
                             rowSelection={{

src/pages/weComTask/page/alarmGl/tableConfig.tsx

@@ -83,9 +83,9 @@ export function TableConfig(handleMsg: (ids: number[]) => void): ColumnsType<any
             },
         },
         {
-            title: '报警时间',
-            dataIndex: 'alarmTime',
-            key: 'alarmTime',
+            title: '告警记录日期',
+            dataIndex: 'recordDate',
+            key: 'recordDate',
             align: 'center',
             width: 120,
             ellipsis: true,