diff --git a/kafka-manager-console/package.json b/kafka-manager-console/package.json index 15e2b523..d768bc73 100644 --- a/kafka-manager-console/package.json +++ b/kafka-manager-console/package.json @@ -1,6 +1,6 @@ { "name": "logi-kafka", - "version": "2.4.3", + "version": "2.5.0", "description": "", "scripts": { "start": "webpack-dev-server", @@ -57,4 +57,4 @@ "dependencies": { "format-to-json": "^1.0.4" } -} +} \ No newline at end of file diff --git a/kafka-manager-console/src/assets/image/weChat.png b/kafka-manager-console/src/assets/image/weChat.png new file mode 100644 index 00000000..126f5816 Binary files /dev/null and b/kafka-manager-console/src/assets/image/weChat.png differ diff --git a/kafka-manager-console/src/assets/image/wechat.jpeg b/kafka-manager-console/src/assets/image/wechats.jpeg similarity index 100% rename from kafka-manager-console/src/assets/image/wechat.jpeg rename to kafka-manager-console/src/assets/image/wechats.jpeg diff --git a/kafka-manager-console/src/component/chart/date-picker-chart.tsx b/kafka-manager-console/src/component/chart/date-picker-chart.tsx index 0e0d6d6a..cda4a6d0 100644 --- a/kafka-manager-console/src/component/chart/date-picker-chart.tsx +++ b/kafka-manager-console/src/component/chart/date-picker-chart.tsx @@ -60,6 +60,22 @@ export class ChartWithDatePicker extends React.Component { public changeChartOptions(options: any) { const noData = options.series.length ? false : true; this.setState({ noData }); + options.tooltip.formatter = (params: any) => { + var res = + "

" + + params[0].data.time + + "

"; + for (var i = 0; i < params.length; i++) { + res += `
+ + ${params[i].seriesName} + ${params[i].data[params[i].seriesName]} +
`; + } + return res; + } this.chart.setOption(options, true); } @@ -79,7 +95,7 @@ export class ChartWithDatePicker extends React.Component { public render() { const { customerNode } = this.props; return ( -
+
{customerNode} diff --git a/kafka-manager-console/src/container/header/index.tsx b/kafka-manager-console/src/container/header/index.tsx index e12e397c..c668335a 100644 --- a/kafka-manager-console/src/container/header/index.tsx +++ b/kafka-manager-console/src/container/header/index.tsx @@ -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 = ( -
- +
+
); const helpCenter = ( @@ -144,7 +144,7 @@ export const Header = observer((props: IHeader) => {
- Kafka Manager + LogiKM v2.4.2 {/* 添加版本超链接 */}
diff --git a/kafka-manager-console/src/container/user-center/order-list.tsx b/kafka-manager-console/src/container/user-center/order-list.tsx index 6c81b0ec..119168cd 100644 --- a/kafka-manager-console/src/container/user-center/order-list.tsx +++ b/kafka-manager-console/src/container/user-center/order-list.tsx @@ -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', diff --git a/kafka-manager-console/src/routers/index.htm b/kafka-manager-console/src/routers/index.htm index b8d8454f..7cb7a0fd 100644 --- a/kafka-manager-console/src/routers/index.htm +++ b/kafka-manager-console/src/routers/index.htm @@ -1,12 +1,15 @@ + - KafkaManager + LogiKM +
+ \ No newline at end of file