V2.5.0前端 更换二维码&前端bugfix

This commit is contained in:
孙超
2021-11-23 17:48:10 +08:00
parent 54fbdcadf9
commit fd1c0b71c5
7 changed files with 39 additions and 12 deletions

View File

@@ -7,7 +7,7 @@ import { urlPrefix } from 'constants/left-menu';
import { region, IRegionIdcs } from 'store/region';
import logoUrl from '../../assets/image/kafka-logo.png';
import userIcon from '../../assets/image/normal.png';
import weChat from '../../assets/image/wechat.jpeg';
import weChat from '../../assets/image/wechat.png';
import { users } from 'store/users';
import { observer } from 'mobx-react';
import { Link } from 'react-router-dom';
@@ -60,8 +60,8 @@ export const Header = observer((props: IHeader) => {
});
};
const content = (
<div style={{ height: '250px', padding: '5px' }} className="kafka-avatar-img">
<img style={{ width: '190px', height: '246px' }} src={weChat} alt="" />
<div style={{ height: '200px', padding: '5px' }} className="kafka-avatar-img">
<img style={{ width: '190px', height: '190px' }} src={weChat} alt="" />
</div>
);
const helpCenter = (
@@ -144,7 +144,7 @@ export const Header = observer((props: IHeader) => {
<div className="kafka-header-container">
<div className="left-content">
<img className="kafka-header-icon" src={logoUrl} alt="" />
<span className="kafka-header-text">Kafka Manager</span>
<span className="kafka-header-text">LogiKM</span>
<a className='kafka-header-version' href="https://github.com/didi/Logi-KafkaManager/releases" target='_blank'>v2.4.2</a>
{/* 添加版本超链接 */}
</div>

View File

@@ -115,11 +115,19 @@ export class OrderList extends SearchAndFilterContainer {
status,
{
title: '申请时间',
dataIndex: 'gmtTime',
key: 'gmtTime',
sorter: (a: IBaseOrder, b: IBaseOrder) => b.gmtTime - a.gmtTime,
dataIndex: 'gmtCreate',
key: 'gmtCreate',
sorter: (a: IBaseOrder, b: IBaseOrder) => b.gmtCreate - a.gmtCreate,
render: (t: number) => moment(t).format(timeFormat),
}, {
},
{
title: '审批时间',
dataIndex: 'gmtHandle',
key: 'gmtHandle',
sorter: (a: IBaseOrder, b: IBaseOrder) => b.gmtHandle - a.gmtHandle,
render: (t: number) => moment(t).format(timeFormat),
},
{
title: '操作',
key: 'operation',
dataIndex: 'operation',