Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	web/src/components/Login.js
#	web/src/components/user/LayoutHeader.js
This commit is contained in:
dushixiang
2021-03-21 16:48:15 +08:00
116 changed files with 3412 additions and 3011 deletions

View File

@ -7,7 +7,6 @@ import {
Layout,
Modal,
notification,
PageHeader,
Row,
Select,
Space,
@ -18,7 +17,7 @@ import {
} from "antd";
import qs from "qs";
import request from "../../common/request";
import {differTime, itemRender} from "../../utils/utils";
import {differTime} from "../../utils/utils";
import Playback from "./Playback";
import {message} from "antd/es";
import {DeleteOutlined, ExclamationCircleOutlined, SyncOutlined, UndoOutlined} from "@ant-design/icons";
@ -30,16 +29,6 @@ const confirm = Modal.confirm;
const {Content} = Layout;
const {Search} = Input;
const {Title, Text} = Typography;
const routes = [
{
path: '',
breadcrumbName: '首页',
},
{
path: 'offlineSession',
breadcrumbName: '离线会话',
}
];
class OfflineSession extends Component {
@ -365,18 +354,6 @@ class OfflineSession extends Component {
return (
<>
<PageHeader
className="site-page-header-ghost-wrapper"
title="离线会话"
breadcrumb={{
routes: routes,
itemRender: itemRender
}}
subTitle="离线会话管理"
>
</PageHeader>
<Content className="site-layout-background page-content">
<div style={{marginBottom: 20}}>
<Row justify="space-around" align="middle" gutter={24}>