diff --git a/spug_web/src/pages/alarm/contact/Form.js b/spug_web/src/pages/alarm/contact/Form.js
index 91b8804..16f4762 100644
--- a/spug_web/src/pages/alarm/contact/Form.js
+++ b/spug_web/src/pages/alarm/contact/Form.js
@@ -3,86 +3,63 @@
  * Copyright (c) <spug.dev@gmail.com>
  * Released under the AGPL-3.0 License.
  */
-import React from 'react';
+import React, { useState } from 'react';
 import { observer } from 'mobx-react';
 import { Modal, Form, Input, message } from 'antd';
 import http from 'libs/http';
 import store from './store';
 
-@observer
-class ComForm extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      loading: false,
-    }
-  }
+export default observer(function () {
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
 
-  handleSubmit = () => {
-    this.setState({loading: true});
-    const formData = this.props.form.getFieldsValue();
+  function handleSubmit() {
+    setLoading(true);
+    const formData = form.getFieldsValue();
     formData['id'] = store.record.id;
     http.post('/api/alarm/contact/', formData)
       .then(res => {
         message.success('操作成功');
         store.formVisible = false;
         store.fetchRecords()
-      }, () => this.setState({loading: false}))
-  };
+      }, () => setLoading(false))
+  }
 
-  render() {
-    const info = store.record;
-    const {getFieldDecorator} = this.props.form;
-    return (
-      <Modal
-        visible
-        width={800}
-        maskClosable={false}
-        title={store.record.id ? '编辑联系人' : '新建联系人'}
-        onCancel={() => store.formVisible = false}
-        confirmLoading={this.state.loading}
-        onOk={this.handleSubmit}>
-        <Form labelCol={{span: 6}} wrapperCol={{span: 14}}>
-          <Form.Item required label="姓名">
-            {getFieldDecorator('name', {initialValue: info['name']})(
-              <Input placeholder="请输入联系人姓名"/>
-            )}
-          </Form.Item>
-          <Form.Item label="手机号">
-            {getFieldDecorator('phone', {initialValue: info['phone']})(
-              <Input placeholder="请输入手机号"/>
-            )}
-          </Form.Item>
-          <Form.Item label="邮箱">
-            {getFieldDecorator('email', {initialValue: info['email']})(
-              <Input placeholder="请输入邮箱地址"/>
-            )}
-          </Form.Item>
-          <Form.Item label="微信Token" extra={
-            <a target="_blank" rel="noopener noreferrer"
-               href="https://spug.dev/docs/alarm-contact/">如何获取微信 Token ？</a>}>
-            {getFieldDecorator('wx_token', {initialValue: info['wx_token']})(
-              <Input placeholder="请输入微信token"/>
-            )}
-          </Form.Item>
-          <Form.Item label="钉钉" extra={<span>
+  return (
+    <Modal
+      visible
+      width={800}
+      maskClosable={false}
+      title={store.record.id ? '编辑联系人' : '新建联系人'}
+      onCancel={() => store.formVisible = false}
+      confirmLoading={loading}
+      onOk={handleSubmit}>
+      <Form form={form} initialValues={store.record} labelCol={{span: 6}} wrapperCol={{span: 14}}>
+        <Form.Item required name="name" label="姓名">
+          <Input placeholder="请输入联系人姓名"/>
+        </Form.Item>
+        <Form.Item name="phone" label="手机号">
+          <Input placeholder="请输入手机号"/>
+        </Form.Item>
+        <Form.Item name="email" label="邮箱">
+          <Input placeholder="请输入邮箱地址"/>
+        </Form.Item>
+        <Form.Item name="wx_token" label="微信Token" extra={
+          <a target="_blank" rel="noopener noreferrer"
+             href="https://spug.dev/docs/alarm-contact/">如何获取微信 Token ？</a>}>
+          <Input placeholder="请输入微信token"/>
+        </Form.Item>
+        <Form.Item name="ding" label="钉钉" extra={<span>
             钉钉收不到通知？请参考
             <a target="_blank" rel="noopener noreferrer"
                href="https://spug.dev/docs/install-error/#%E9%92%89%E9%92%89%E6%94%B6%E4%B8%8D%E5%88%B0%E9%80%9A%E7%9F%A5%EF%BC%9F">官方文档</a>
           </span>}>
-            {getFieldDecorator('ding', {initialValue: info['ding']})(
-              <Input placeholder="请输入钉钉机器人完整地址"/>
-            )}
-          </Form.Item>
-          <Form.Item label="企业微信">
-            {getFieldDecorator('qy_wx', {initialValue: info['qy_wx']})(
-              <Input placeholder="请输入企业微信机器人完整地址"/>
-            )}
-          </Form.Item>
-        </Form>
-      </Modal>
-    )
-  }
-}
-
-export default Form.create()(ComForm)
+          <Input placeholder="请输入钉钉机器人完整地址"/>
+        </Form.Item>
+        <Form.Item name="qy_wx" label="企业微信">
+          <Input placeholder="请输入企业微信机器人完整地址"/>
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+})
\ No newline at end of file
diff --git a/spug_web/src/pages/alarm/contact/Table.js b/spug_web/src/pages/alarm/contact/Table.js
index 89a4491..3ee3d6f 100644
--- a/spug_web/src/pages/alarm/contact/Table.js
+++ b/spug_web/src/pages/alarm/contact/Table.js
@@ -6,10 +6,10 @@
 import React from 'react';
 import { observer } from 'mobx-react';
 import { Table, Modal, message } from 'antd';
-import ComForm from './Form';
+import { PlusOutlined } from '@ant-design/icons';
+import { Action, TableCard, AuthButton } from 'components';
 import { http, hasPermission } from 'libs';
 import store from './store';
-import { Action } from "components";
 
 @observer
 class ComTable extends React.Component {
@@ -32,40 +32,42 @@ class ComTable extends React.Component {
   };
 
   render() {
-    let data = store.records;
-    if (store.f_name) {
-      data = data.filter(item => item['name'].toLowerCase().includes(store.f_name.toLowerCase()))
-    }
     return (
-      <React.Fragment>
-        <Table
-          rowKey="id"
-          loading={store.isFetching}
-          dataSource={data}
-          pagination={{
-            showSizeChanger: true,
-            showLessItems: true,
-            hideOnSinglePage: true,
-            showTotal: total => `共 ${total} 条`,
-            pageSizeOptions: ['10', '20', '50', '100']
-          }}>
-          <Table.Column width={80} title="序号" key="series" render={(_, __, index) => index + 1}/>
-          <Table.Column title="姓名" dataIndex="name"/>
-          <Table.Column title="手机号" dataIndex="phone"/>
-          <Table.Column ellipsis title="邮箱" dataIndex="email"/>
-          <Table.Column ellipsis title="钉钉" dataIndex="ding"/>
-          <Table.Column ellipsis title="企业微信" dataIndex="qy_wx"/>
-          {hasPermission('alarm.contact.edit|alarm.contact.del') && (
-            <Table.Column title="操作" render={info => (
-              <Action>
-                <Action.Button auth="alarm.contact.edit" onClick={() => store.showForm(info)}>编辑</Action.Button>
-                <Action.Button auth="alarm.contact.del" onClick={() => this.handleDelete(info)}>删除</Action.Button>
-              </Action>
-            )}/>
-          )}
-        </Table>
-        {store.formVisible && <ComForm/>}
-      </React.Fragment>
+      <TableCard
+        rowKey="id"
+        title="报警联系人"
+        loading={store.isFetching}
+        dataSource={store.dataSource}
+        onReload={store.fetchRecords}
+        actions={[
+          <AuthButton
+            auth="alarm.contact.add"
+            type="primary"
+            icon={<PlusOutlined/>}
+            onClick={() => store.showForm()}>新建</AuthButton>
+        ]}
+        pagination={{
+          showSizeChanger: true,
+          showLessItems: true,
+          hideOnSinglePage: true,
+          showTotal: total => `共 ${total} 条`,
+          pageSizeOptions: ['10', '20', '50', '100']
+        }}>
+        <Table.Column title="姓名" dataIndex="name"/>
+        <Table.Column title="手机号" dataIndex="phone"/>
+        <Table.Column ellipsis title="邮箱" dataIndex="email"/>
+        <Table.Column ellipsis hide title="钉钉" dataIndex="ding"/>
+        <Table.Column ellipsis hide title="微信" dataIndex="wx_token"/>
+        <Table.Column ellipsis hide title="企业微信" dataIndex="qy_wx"/>
+        {hasPermission('alarm.contact.edit|alarm.contact.del') && (
+          <Table.Column title="操作" render={info => (
+            <Action>
+              <Action.Button auth="alarm.contact.edit" onClick={() => store.showForm(info)}>编辑</Action.Button>
+              <Action.Button auth="alarm.contact.del" onClick={() => this.handleDelete(info)}>删除</Action.Button>
+            </Action>
+          )}/>
+        )}
+      </TableCard>
     )
   }
 }
diff --git a/spug_web/src/pages/alarm/contact/index.js b/spug_web/src/pages/alarm/contact/index.js
index d139189..f7894fc 100644
--- a/spug_web/src/pages/alarm/contact/index.js
+++ b/spug_web/src/pages/alarm/contact/index.js
@@ -5,26 +5,27 @@
  */
 import React from 'react';
 import { observer } from 'mobx-react';
-import { Input, Button } from 'antd';
-import { SearchForm, AuthDiv, AuthCard } from 'components';
+import { Input } from 'antd';
+import { SearchForm, AuthDiv, Breadcrumb } from 'components';
 import ComTable from './Table';
+import ComForm from './Form';
 import store from './store';
 
 export default observer(function () {
   return (
-    <AuthCard auth="alarm.contact.view">
+    <AuthDiv auth="alarm.contact.view">
+      <Breadcrumb>
+        <Breadcrumb.Item>首页</Breadcrumb.Item>
+        <Breadcrumb.Item>报警中心</Breadcrumb.Item>
+        <Breadcrumb.Item>报警联系人</Breadcrumb.Item>
+      </Breadcrumb>
       <SearchForm>
         <SearchForm.Item span={8} title="姓名">
           <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
-        <SearchForm.Item span={8}>
-          <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>
-        </SearchForm.Item>
       </SearchForm>
-      <AuthDiv auth="alarm.contact.add" style={{marginBottom: 16}}>
-        <Button type="primary" icon="plus" onClick={() => store.showForm()}>新建</Button>
-      </AuthDiv>
       <ComTable/>
-    </AuthCard>
-  )
+      {store.formVisible && <ComForm/>}
+    </AuthDiv>
+  );
 })
diff --git a/spug_web/src/pages/alarm/contact/store.js b/spug_web/src/pages/alarm/contact/store.js
index fd443a6..27f46c6 100644
--- a/spug_web/src/pages/alarm/contact/store.js
+++ b/spug_web/src/pages/alarm/contact/store.js
@@ -3,7 +3,7 @@
  * Copyright (c) <spug.dev@gmail.com>
  * Released under the AGPL-3.0 License.
  */
-import { observable } from "mobx";
+import { observable, computed } from 'mobx';
 import http from 'libs/http';
 
 class Store {
@@ -14,6 +14,12 @@ class Store {
 
   @observable f_name;
 
+  @computed get dataSource() {
+    let records = this.records;
+    if (this.f_name) records = records.filter(x => x.name.toLowerCase().includes(this.f_name.toLowerCase()))
+    return records
+  }
+
   fetchRecords = () => {
     this.isFetching = true;
     return http.get('/api/alarm/contact/')