Unverified Commit 345684d5 authored by Lijiaoa's avatar Lijiaoa Committed by GitHub
Browse files

[WebUI] fix issue#1489: Enhancement to trial duration display (#2523)

parent 2dfbf91d
...@@ -20,9 +20,11 @@ ...@@ -20,9 +20,11 @@
width: 90%; width: 90%;
margin: 0 auto; margin: 0 auto;
} }
.contentBox{ .contentBox{
width: 100%; width: 100%;
} }
.content{ .content{
width: 89%; width: 89%;
min-width: 1024px; min-width: 1024px;
......
import * as React from 'react'; import * as React from 'react';
import ReactEcharts from 'echarts-for-react'; import ReactEcharts from 'echarts-for-react';
import { TableObj, EventMap } from '../../static/interface'; // eslint-disable-line no-unused-vars import { TableObj, EventMap } from '../../static/interface'; // eslint-disable-line no-unused-vars
import { filterDuration } from '../../static/function'; import { filterDuration, convertDuration } from '../../static/function';
import 'echarts/lib/chart/bar'; import 'echarts/lib/chart/bar';
import 'echarts/lib/component/tooltip'; import 'echarts/lib/component/tooltip';
import 'echarts/lib/component/title'; import 'echarts/lib/component/title';
...@@ -49,7 +49,13 @@ class Duration extends React.Component<DurationProps, DurationState> { ...@@ -49,7 +49,13 @@ class Duration extends React.Component<DurationProps, DurationState> {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
type: 'shadow' type: 'shadow'
} },
formatter: (data: any): React.ReactNode => (
'<div>' +
'<div>Trial No.: ' + data[0].dataIndex + '</div>' +
'<div>Duration: ' + convertDuration(data[0].data) + '</div>' +
'</div>'
),
}, },
grid: { grid: {
bottom: '3%', bottom: '3%',
...@@ -93,7 +99,13 @@ class Duration extends React.Component<DurationProps, DurationState> { ...@@ -93,7 +99,13 @@ class Duration extends React.Component<DurationProps, DurationState> {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
type: 'shadow' type: 'shadow'
} },
formatter: (data: any): React.ReactNode => (
'<div>' +
'<div>Trial No.: ' + data[0].dataIndex + '</div>' +
'<div>Duration: ' + convertDuration(data[0].data) + '</div>' +
'</div>'
),
}, },
grid: { grid: {
bottom: '3%', bottom: '3%',
......
...@@ -3,7 +3,7 @@ import axios from 'axios'; ...@@ -3,7 +3,7 @@ import axios from 'axios';
import { MANAGER_IP } from './const'; import { MANAGER_IP } from './const';
import { MetricDataRecord, FinalType, TableObj } from './interface'; import { MetricDataRecord, FinalType, TableObj } from './interface';
async function requestAxios(url: string) { async function requestAxios(url: string): Promise<any> {
const response = await axios.get(url); const response = await axios.get(url);
if (response.status === 200) { if (response.status === 200) {
if (response.data.error !== undefined) { if (response.data.error !== undefined) {
......
import axios from 'axios';
import { MANAGER_IP } from '../const'; import { MANAGER_IP } from '../const';
import { ExperimentProfile, NNIManagerStatus } from '../interface'; import { ExperimentProfile, NNIManagerStatus } from '../interface';
import { requestAxios } from '../function'; import { requestAxios } from '../function';
......
import axios from 'axios';
import { MANAGER_IP, METRIC_GROUP_UPDATE_THRESHOLD, METRIC_GROUP_UPDATE_SIZE } from '../const'; import { MANAGER_IP, METRIC_GROUP_UPDATE_THRESHOLD, METRIC_GROUP_UPDATE_SIZE } from '../const';
import { MetricDataRecord, TableRecord, TrialJobInfo } from '../interface'; import { MetricDataRecord, TableRecord, TrialJobInfo } from '../interface';
import { Trial } from './trial'; import { Trial } from './trial';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment