Commit d937324e authored by 涂茜's avatar 涂茜

fix: update historyinfo and realtimeinfo

parent 63e353b1
Pipeline #25598 failed with stages
in 1 minute 23 seconds
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
"dependencies": { "dependencies": {
"@wisdom-components/Empty": "^1.2.0", "@wisdom-components/Empty": "^1.2.0",
"@wisdom-components/timerangepicker": "1.3.3", "@wisdom-components/timerangepicker": "1.3.3",
"@wisdom-components/basictable": "^1.1.0",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"highcharts": "^9.0.1", "highcharts": "^9.0.1",
"highcharts-react-official": "^3.0.0", "highcharts-react-official": "^3.0.0",
......
...@@ -11,6 +11,7 @@ const Demo = () => { ...@@ -11,6 +11,7 @@ const Demo = () => {
title: '采集时间', title: '采集时间',
dataIndex: 'time', dataIndex: 'time',
key: 'time', key: 'time',
width: 160,
}, },
]); ]);
......
...@@ -3,9 +3,10 @@ import PropTypes from 'prop-types'; ...@@ -3,9 +3,10 @@ import PropTypes from 'prop-types';
import classNames from 'classnames'; import classNames from 'classnames';
import Highcharts from 'highcharts/highstock'; import Highcharts from 'highcharts/highstock';
import HighchartsReact from 'highcharts-react-official'; import HighchartsReact from 'highcharts-react-official';
import { Tabs, Select, Radio, Checkbox, Table, ConfigProvider, DatePicker } from 'antd'; import { Tabs, Select, Radio, Checkbox, ConfigProvider, DatePicker } from 'antd';
import { PlusCircleOutlined } from '@ant-design/icons'; import { PlusCircleOutlined } from '@ant-design/icons';
import TimeRangePicker from '@wisdom-components/timerangepicker'; import TimeRangePicker from '@wisdom-components/timerangepicker';
import BasicTable from '@wisdom-components/basictable';
import Empty from '@wisdom-components/Empty'; import Empty from '@wisdom-components/Empty';
import moment from 'moment'; import moment from 'moment';
import './index.less'; import './index.less';
...@@ -471,7 +472,7 @@ const HistoryInfo = (props) => { ...@@ -471,7 +472,7 @@ const HistoryInfo = (props) => {
/> />
)} )}
{item.key === 'table' && ( {item.key === 'table' && (
<Table dataSource={dataSource} columns={columns} {...tableProps} /> <BasicTable dataSource={dataSource} columns={columns} {...tableProps} />
)} )}
</div> </div>
)} )}
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"test": "echo \"Error: run tests from root\" && exit 1" "test": "echo \"Error: run tests from root\" && exit 1"
}, },
"dependencies": { "dependencies": {
"classnames": "^2.2.6" "classnames": "^2.2.6",
"@wisdom-components/basictable": "^1.1.0"
} }
} }
import React, { useContext } from 'react'; import React, { useContext } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classNames from 'classnames'; import classNames from 'classnames';
import { Input, Radio, Table, ConfigProvider } from 'antd'; import { Input, Radio, ConfigProvider } from 'antd';
import BasicTable from '@wisdom-components/basictable';
import './index.less'; import './index.less';
const RealTimeInfo = (props) => { const RealTimeInfo = (props) => {
...@@ -29,7 +30,7 @@ const RealTimeInfo = (props) => { ...@@ -29,7 +30,7 @@ const RealTimeInfo = (props) => {
<div>采集编码:{guid}</div> <div>采集编码:{guid}</div>
<div>更新时间:{updateTime}</div> <div>更新时间:{updateTime}</div>
</div> </div>
<Table {...props} /> <BasicTable {...props} />
</div> </div>
); );
}; };
......
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