Commit 8c7dd0a4 authored by 陈龙's avatar 陈龙

fix: 修复被回退的代码

parent 3ec8e3f6
...@@ -13,6 +13,9 @@ const SimgleChart = memo((props) => { ...@@ -13,6 +13,9 @@ const SimgleChart = memo((props) => {
curveCenter, curveCenter,
showGridLine = false, showGridLine = false,
deviceAlarmSchemes, deviceAlarmSchemes,
chartType,
justLine
} = props; } = props;
const chartRef = useRef(); const chartRef = useRef();
...@@ -24,6 +27,8 @@ const SimgleChart = memo((props) => { ...@@ -24,6 +27,8 @@ const SimgleChart = memo((props) => {
deviceAlarmSchemes, deviceAlarmSchemes,
showMarkLine: true, showMarkLine: true,
showPoint: true, showPoint: true,
chartType,
justLine
}; };
return optionGenerator(dataSource, null, contrast, contrastOption, smooth, config); return optionGenerator(dataSource, null, contrast, contrastOption, smooth, config);
}, [dataSource, smooth, curveCenter]); }, [dataSource, smooth, curveCenter]);
......
...@@ -25,7 +25,7 @@ const deviceParams = [ ...@@ -25,7 +25,7 @@ const deviceParams = [
const Demo = () => { const Demo = () => {
return ( return (
<div style={{ height: 700 }}> <div style={{ height: 700 }}>
<HistoryView deviceParams={deviceParams} grid /> {/*<HistoryView deviceParams={deviceParams} grid />*/}
</div> </div>
); );
}; };
......
...@@ -2,18 +2,19 @@ import React from 'react'; ...@@ -2,18 +2,19 @@ import React from 'react';
import HistoryView from '../index'; import HistoryView from '../index';
const deviceParams = [ const deviceParams = [
// {
// deviceCode: 'EGBF00000146',
// sensors: '进水压力,出水瞬时流量,出水累计流量',
// deviceType: '二供泵房',
// pointAddressID: 4,
// },
{ {
deviceCode: 'EGBF00000146', // deviceCode: 'EGBF00000002',
sensors: '进水压力,出水瞬时流量,出水累计流量', deviceCode: 'EGBF00000082',
sensors: '进水压力',
deviceType: '二供泵房', deviceType: '二供泵房',
pointAddressID: 4, pointAddressID: 4,
}, },
{
deviceCode: 'EGJZ00001113',
sensors: '出水瞬时流量,出水压力,泵1状态',
deviceType: '二供机组',
pointAddressID: 4,
},
// { // {
// deviceCode: 'EGJZ00001113', // deviceCode: 'EGJZ00001113',
// sensors: '出水压力', // sensors: '出水压力',
......
...@@ -459,7 +459,7 @@ const optionGenerator = (dataSource, cusOption, contrast, contrastOption, smooth ...@@ -459,7 +459,7 @@ const optionGenerator = (dataSource, cusOption, contrast, contrastOption, smooth
let unit = '' let unit = ''
series = series.map(item => { series = series.map(item => {
if (item.unit) unit = item.unit; if (item.unit) unit = item.unit;
let _item = {...item, symbol: null}; let _item = {...item, symbol: 'none'};
_item.data = _item?.data?.map(d => { _item.data = _item?.data?.map(d => {
return d[1] || null return d[1] || null
}) || []; }) || [];
...@@ -468,7 +468,7 @@ const optionGenerator = (dataSource, cusOption, contrast, contrastOption, smooth ...@@ -468,7 +468,7 @@ const optionGenerator = (dataSource, cusOption, contrast, contrastOption, smooth
series.push({ series.push({
type: 'candlestick', type: 'candlestick',
name: '箱线图', name: '箱线图',
symbol: null, symbol: 'none',
data: otherData, data: otherData,
}); });
tooltip = tooltipAccessor(unit) tooltip = tooltipAccessor(unit)
...@@ -482,7 +482,7 @@ const optionGenerator = (dataSource, cusOption, contrast, contrastOption, smooth ...@@ -482,7 +482,7 @@ const optionGenerator = (dataSource, cusOption, contrast, contrastOption, smooth
}); //当存在othersData的时候,只是单曲线 }); //当存在othersData的时候,只是单曲线
xAxis = {type: 'category', data: series[0].data.map(item => moment(item[0]).format('YYYY-MM-DD'))}; xAxis = {type: 'category', data: series[0].data.map(item => moment(item[0]).format('YYYY-MM-DD'))};
series = series.map(item => { series = series.map(item => {
let _item = {...item, symbol: false}; let _item = {...item, symbol: 'none'};
_item.data = _item?.data?.map(d => { _item.data = _item?.data?.map(d => {
return d[1] || null return d[1] || null
}) || []; }) || [];
......
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