Commit d2a8be44 authored by 李纪文's avatar 李纪文

fix: 修改

parent 3d74dcb1
...@@ -3051,7 +3051,7 @@ const ConfigurationView = (props) => { ...@@ -3051,7 +3051,7 @@ const ConfigurationView = (props) => {
onOk={() => setIsHIModalVisible(false)} onOk={() => setIsHIModalVisible(false)}
onCancel={() => setIsHIModalVisible(false)} onCancel={() => setIsHIModalVisible(false)}
getContainer={ConfigurationRef.current} getContainer={ConfigurationRef.current}
title={historyInfoParams.length ? historyInfoParams[0].sensors || '' : ''} // title={historyInfoParams.length ? historyInfoParams[0].sensors || '' : ''}
wrapClassName={classNames(`${prefixCls}-historyInfoModal`)} wrapClassName={classNames(`${prefixCls}-historyInfoModal`)}
> >
<HistoryView deviceParams={historyInfoParams} /> <HistoryView deviceParams={historyInfoParams} />
......
...@@ -12,7 +12,7 @@ import './index.less'; ...@@ -12,7 +12,7 @@ import './index.less';
const StatisticalHistoryView = (props) => { const StatisticalHistoryView = (props) => {
const { getPrefixCls } = useContext(ConfigProvider.ConfigContext); const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);
const prefixCls = getPrefixCls('ec-statistical-history-view'); const prefixCls = getPrefixCls('ec-statistical-history-view');
const componentPrefix = getPrefixCls(''); const chartRef = useRef(null);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [historyRender, setHistoryRender] = useState(true); const [historyRender, setHistoryRender] = useState(true);
...@@ -32,6 +32,7 @@ const StatisticalHistoryView = (props) => { ...@@ -32,6 +32,7 @@ const StatisticalHistoryView = (props) => {
const [picker, setPicker] = useState('day'); const [picker, setPicker] = useState('day');
const [time, setTime] = useState({ startTime: '', endTime: '' }); const [time, setTime] = useState({ startTime: '', endTime: '' });
const [dateTime, setDateTime] = useState(moment().format('YYYY-MM-DD HH:mm:ss')); const [dateTime, setDateTime] = useState(moment().format('YYYY-MM-DD HH:mm:ss'));
const [hoverIndex, setHoverIndex] = useState(null);
// 时间切换筛选 // 时间切换筛选
const onTimeChange = (e) => { const onTimeChange = (e) => {
...@@ -200,7 +201,7 @@ const StatisticalHistoryView = (props) => { ...@@ -200,7 +201,7 @@ const StatisticalHistoryView = (props) => {
}, },
grid: { grid: {
containLabel: true, containLabel: true,
left: 10, left: 20,
right: 10, right: 10,
// top: 20, // top: 20,
bottom: 10, bottom: 10,
...@@ -355,7 +356,7 @@ const StatisticalHistoryView = (props) => { ...@@ -355,7 +356,7 @@ const StatisticalHistoryView = (props) => {
{ {
<> <>
<div className={classNames(`${prefixCls}-chart`)}> <div className={classNames(`${prefixCls}-chart`)}>
<BasicChart option={options} notMerge style={{ width: '100%', height: '100%' }} /> <BasicChart ref={chartRef} option={options} notMerge style={{ width: '100%', height: '100%' }} />
</div> </div>
<div className={classNames(`${prefixCls}-table`)}> <div className={classNames(`${prefixCls}-table`)}>
<BasicTable <BasicTable
......
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