Skip to content

W
wisdom-components
Commit 8c7dd0a4 authored by 陈龙's avatar 陈龙
Browse files
Options

fix: 修复被回退的代码

parent 3ec8e3f6
Hide whitespace changes
Inline Side-by-side
Showing with 815 additions and 820 deletions
packages/extend-components/EC_HistoryView/src/SingleChart.js
View file @ 8c7dd0a4
...@@ -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]);
......
packages/extend-components/EC_HistoryView/src/demos/GridDemo.js
View file @ 8c7dd0a4
...@@ -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>
); );
}; };
......
packages/extend-components/EC_HistoryView/src/demos/index.js
View file @ 8c7dd0a4
...@@ -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: '出水压力',
......
packages/extend-components/EC_HistoryView/src/index.js
View file @ 8c7dd0a4
import React, { useContext, useEffect, useMemo, useState } from 'react'; import React, {useContext, useEffect, useMemo, useState} from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classNames from 'classnames'; import classNames from 'classnames';
import { import {
Checkbox, Checkbox,
ConfigProvider, ConfigProvider,
DatePicker, DatePicker,
Radio, Radio,
Select, Select,
Spin, Spin,
Tabs, Tabs,
Tooltip, Tooltip,
Button, Button,
} from 'antd'; } from 'antd';
import { import {
CloseCircleFilled, CloseCircleFilled,
PlusCircleOutlined, PlusCircleOutlined,
QuestionCircleFilled, QuestionCircleFilled,
DownloadOutlined, DownloadOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import moment from 'moment'; import moment from 'moment';
import _ from 'lodash'; import _ from 'lodash';
import TimeRangePicker from '@wisdom-components/timerangepicker'; import TimeRangePicker from '@wisdom-components/timerangepicker';
import PandaEmpty from '@wisdom-components/empty'; import PandaEmpty from '@wisdom-components/empty';
import BasicTable from '@wisdom-components/basictable'; import BasicTable from '@wisdom-components/basictable';
import { getHistoryInfo, getDeviceAlarmScheme, getExportDeviceHistoryUrl } from './apis'; import {getHistoryInfo, getDeviceAlarmScheme, getExportDeviceHistoryUrl} from './apis';
import SimgleChart from './SingleChart'; import SimgleChart from './SingleChart';
import GridChart from './GridChart'; import GridChart from './GridChart';
import './index.less'; import './index.less';
import { globalConfig } from 'antd/lib/config-provider'; import {globalConfig} from 'antd/lib/config-provider';
const { RangePicker } = DatePicker; const {RangePicker} = DatePicker;
const { Option } = Select; const {Option} = Select;
const startFormat = 'YYYY-MM-DD 00:00:00'; const startFormat = 'YYYY-MM-DD 00:00:00';
const endFormat = 'YYYY-MM-DD 23:59:59'; const endFormat = 'YYYY-MM-DD 23:59:59';
const timeFormat = 'YYYY-MM-DD HH:mm:ss'; const timeFormat = 'YYYY-MM-DD HH:mm:ss';
const dateFormat = 'YYYYMMDD'; const dateFormat = 'YYYYMMDD';
// 时间列表
const timeList = [ const timeList = [
{ {
key: 'twelveHours', key: 'twelveHours',
name: '近12小时', name: '近12小时',
}, },
{ {
key: 'roundClock', key: 'roundClock',
name: '近24小时', name: '近24小时',
}, },
{ {
key: 'oneWeek', key: 'oneWeek',
name: '近1周', name: '近1周',
}, },
{ {
key: 'oneMonth', key: 'oneMonth',
name: '近1月', name: '近1月',
}, },
]; ];
const CheckboxData = [ const CheckboxData = [
{ {
key: 'curveCenter', key: 'curveCenter',
label: '曲线居中', label: '曲线居中',
checked: false, checked: false,
showInCurve: true, showInCurve: true,
showInTable: false, showInTable: false,
}, },
{ {
key: 'chartGrid', key: 'chartGrid',
label: '图表网格', label: '图表网格',
checked: true, checked: true,
showInCurve: true, showInCurve: true,
showInTable: false, showInTable: false,
}, },
{ {
key: 'ignoreOutliers', key: 'ignoreOutliers',
label: '数据滤波', label: '数据滤波',
type: 'updateIgnoreOutliers', type: 'updateIgnoreOutliers',
checked: false, checked: false,
showInCurve: true, showInCurve: true,
showInTable: true, showInTable: true,
tooltip: '数据滤波针对与样本平均值相差2个标准差以上的值进行过滤。', tooltip: '数据滤波针对与样本平均值相差2个标准差以上的值进行过滤。',
}, },
{ {
key: 'justLine', key: 'justLine',
label: '仅查看曲线', label: '仅查看曲线',
type: '', type: '',
checked: false, checked: false,
showInCurve: false, showInCurve: false,
showInTable: false, showInTable: false,
}, },
{ {
key: 'dataThin', key: 'dataThin',
label: '数据抽稀', label: '数据抽稀',
type: 'updateDataThin', type: 'updateDataThin',
checked: true, checked: true,
showInCurve: false, showInCurve: false,
showInTable: true, showInTable: true,
}, },
]; ];
const timeIntervalList = [ const timeIntervalList = [
{ {
key: '5', key: '5',
zoom: '5', zoom: '5',
unit: 'min', unit: 'min',
name: '5分钟', name: '5分钟',
}, },
{ {
key: '10', key: '10',
zoom: '10', zoom: '10',
unit: 'min', unit: 'min',
name: '10分钟', name: '10分钟',
}, },
{ {
key: '30', key: '30',
zoom: '30', zoom: '30',
unit: 'min', unit: 'min',
name: '30分钟', name: '30分钟',
}, },
{ {
key: '1', key: '1',
zoom: '1', zoom: '1',
unit: 'h', unit: 'h',
name: '1小时', name: '1小时',
}, },
{ {
key: '2', key: '2',
zoom: '2', zoom: '2',
unit: 'h', unit: 'h',
name: '2小时', name: '2小时',
}, },
{ {
key: '4', key: '4',
zoom: '4', zoom: '4',
unit: 'h', unit: 'h',
name: '4小时', name: '4小时',
}, },
{ {
key: '6', key: '6',
zoom: '6', zoom: '6',
unit: 'h', unit: 'h',
name: '6小时', name: '6小时',
}, },
{ {
key: '12', key: '12',
zoom: '12', zoom: '12',
unit: 'h', unit: 'h',
name: '12小时', name: '12小时',
}, },
]; ];
const updateTime = (key) => { const updateTime = (key) => {
let start = ''; let start = '';
let end = ''; let end = '';
if (Array.isArray(key)) { if (Array.isArray(key)) {
start = moment(key[0]).format(timeFormat); start = moment(key[0]).format(timeFormat);
end = moment(key[1]).format(timeFormat); end = moment(key[1]).format(timeFormat);
} else { } else {
switch (key) { switch (key) {
case 'twelveHours': case 'twelveHours':
start = moment().subtract(12, 'hour').format(timeFormat); start = moment().subtract(12, 'hour').format(timeFormat);
end = moment().format(timeFormat); end = moment().format(timeFormat);
break; break;
case 'roundClock': case 'roundClock':
start = moment().subtract(24, 'hour').format(timeFormat); start = moment().subtract(24, 'hour').format(timeFormat);
end = moment().format(timeFormat); end = moment().format(timeFormat);
break; break;
case 'oneWeek': case 'oneWeek':
start = moment().subtract(7, 'day').format(timeFormat); start = moment().subtract(7, 'day').format(timeFormat);
end = moment().format(timeFormat); end = moment().format(timeFormat);
break; break;
case 'oneMonth': case 'oneMonth':
start = moment().subtract(30, 'day').format(timeFormat); start = moment().subtract(30, 'day').format(timeFormat);
end = moment().format(timeFormat); end = moment().format(timeFormat);
break; break;
}
} }
} return [
return [ {
{ dateFrom: start,
dateFrom: start, dateTo: end,
dateTo: end, },
}, ];
];
}; };
const DefaultDatePicker = (value) => [ const DefaultDatePicker = (value) => [
{ {
key: 1, key: 1,
value: moment(), value: moment(),
}, },
{ {
key: 2, key: 2,
value: moment().subtract(1, value), value: moment().subtract(1, value),
}, },
]; ];
const handleBatchTime = (arr, cOption) => { const handleBatchTime = (arr, cOption) => {
let newArr = []; let newArr = [];
arr.forEach((child) => { arr.forEach((child) => {
if (child.value) { if (child.value) {
newArr.push({ newArr.push({
dateFrom: moment(child.value).startOf(cOption).format(startFormat), dateFrom: moment(child.value).startOf(cOption).format(startFormat),
dateTo: moment(child.value).endOf(cOption).format(endFormat), dateTo: moment(child.value).endOf(cOption).format(endFormat),
}); });
} }
}); });
newArr = _.uniqWith(newArr, _.isEqual); // 去掉重复日期时间 newArr = _.uniqWith(newArr, _.isEqual); // 去掉重复日期时间
return newArr; return newArr;
}; };
const timeColumn = { const timeColumn = {
title: '采集时间', title: '采集时间',
dataIndex: 'time', dataIndex: 'time',
key: 'time', key: 'time',
width: 170, width: 170,
fixed: 'left', fixed: 'left',
ellipsis: true, ellipsis: true,
align: 'center', align: 'center',
}; };
const HistoryView = (props) => { const HistoryView = (props) => {
const { getPrefixCls } = useContext(ConfigProvider.ConfigContext); const {getPrefixCls} = useContext(ConfigProvider.ConfigContext);
const prefixCls = getPrefixCls('history-view'); const prefixCls = getPrefixCls('history-view');
const { const {
title, title,
grid, grid,
defaultChecked, defaultChecked,
tableProps, tableProps,
deviceParams, deviceParams,
defaultModel, defaultModel,
showModels, showModels,
needMarkLine, needMarkLine,
} = props; } = props;
const isBoxPlots = const isBoxPlots = deviceParams?.length === 1 && deviceParams[0]?.sensors?.split(',').length === 1;
deviceParams?.length === 1 && deviceParams[0]?.sensors?.split(',').length === 1; const [loading, setLoading] = useState(false);
const [loading, setLoading] = useState(false); const [activeTabKey, setActiveTabKey] = useState(defaultModel);
const [activeTabKey, setActiveTabKey] = useState(defaultModel);
// 时间模式: 自定义模式/同期对比模式
// 时间模式: 自定义模式/同期对比模式 const [timeValue, setTimeValue] = useState('customer');
const [timeValue, setTimeValue] = useState('customer');
// 自定义模式
// 自定义模式 const [customerChecked, setCustomerChecked] = useState(defaultChecked); // 时间快速选择类型值
const [customerChecked, setCustomerChecked] = useState(defaultChecked); // 时间快速选择类型值 const [customerTime, setCustomerTime] = useState(); // 自定义时间选择值
const [customerTime, setCustomerTime] = useState(); // 自定义时间选择值
// 同期对比模式
// 同期对比模式 const [contrastOption, setContrastOption] = useState('day'); // 对比时间类型: 日/月
const [contrastOption, setContrastOption] = useState('day'); // 对比时间类型: 日/月 const [datePickerArr, setDatePickerArr] = useState(DefaultDatePicker('day')); // 对比时间段配置值
const [datePickerArr, setDatePickerArr] = useState(DefaultDatePicker('day')); // 对比时间段配置值
const [checkboxData, setCheckboxData] = useState(() => [...CheckboxData]); // 曲线设置项
const [checkboxData, setCheckboxData] = useState(() => [...CheckboxData]); // 曲线设置项 const [dataThinKey, setDataThinKey] = useState(timeIntervalList[0].key); // 曲线抽稀时间设置
const [dataThinKey, setDataThinKey] = useState(timeIntervalList[0].key); // 曲线抽稀时间设置
const [columns, setColumns] = useState([]);
const [columns, setColumns] = useState([]); const [tableData, setTableData] = useState([]);
const [tableData, setTableData] = useState([]); const [chartDataSource, setChartDataSource] = useState([]);
const [chartDataSource, setChartDataSource] = useState([]);
const [chartType, setChartType] = useState('lineChart');
const [chartType, setChartType] = useState('lineChart'); // 选择的时间范围值
// 选择的时间范围值 const dateRange = useMemo(() => {
const dateRange = useMemo(() => { if (timeValue === 'customer') {
if (timeValue === 'customer') { return updateTime(customerChecked || customerTime);
return updateTime(customerChecked || customerTime); } else {
} else { return handleBatchTime(datePickerArr, contrastOption);
return handleBatchTime(datePickerArr, contrastOption); }
} }, [contrastOption, customerChecked, customerTime, datePickerArr, timeValue]);
}, [contrastOption, customerChecked, customerTime, datePickerArr, timeValue]);
const configDependence = checkboxData
const configDependence = checkboxData .filter((item) => ['curveCenter', 'chartGrid'].indexOf(item.key) === -1)
.filter((item) => ['curveCenter', 'chartGrid'].indexOf(item.key) === -1) .map((item) => item.checked)
.map((item) => item.checked) .join(',');
.join(','); // 数据配置
// 数据配置 const dataConfig = useMemo(() => {
const dataConfig = useMemo(() => { const initial = {
const initial = { ignoreOutliers: false,
ignoreOutliers: false, dataThin: false,
dataThin: false, zoom: '', // 数据抽稀时间
zoom: '', // 数据抽稀时间 unit: '', // 数据抽稀时间单位
unit: '', // 数据抽稀时间单位 };
// 曲线居中，过滤异常值，数据抽稀
const config = checkboxData.reduce(
(pre, item) => (item.key !== 'curveCenter' && (pre[item.key] = item.checked), pre),
initial,
);
// 数据抽稀时间单位
const dataThin = timeIntervalList.find((item) => item.key === dataThinKey);
config.zoom = activeTabKey === 'curve' ? '' : dataThin?.zoom ?? '';
config.unit = activeTabKey === 'curve' ? '' : dataThin?.unit ?? '';
config.dataThin = activeTabKey === 'curve' ? true : config.dataThin; // 曲线强制抽稀
return config;
}, [configDependence, dataThinKey, activeTabKey]);
// 图表居中
const [curveCenter, chartGrid] = useMemo(() => {
const curveCenter = checkboxData.find((item) => item.key === 'curveCenter')?.checked;
const chartGrid = checkboxData.find((item) => item.key === 'chartGrid')?.checked;
return [curveCenter, chartGrid];
}, [checkboxData]);
// 自定义模式: 快速选择
const onCustomerTimeChange = (key) => {
setCustomerChecked(key);
!!customerTime && setCustomerTime(null);
}; };
// 曲线居中，过滤异常值，数据抽稀
const config = checkboxData.reduce(
(pre, item) => (item.key !== 'curveCenter' && (pre[item.key] = item.checked), pre),
initial,
);
// 数据抽稀时间单位
const dataThin = timeIntervalList.find((item) => item.key === dataThinKey);
config.zoom = activeTabKey === 'curve' ? '' : dataThin?.zoom ?? '';
config.unit = activeTabKey === 'curve' ? '' : dataThin?.unit ?? '';
config.dataThin = activeTabKey === 'curve' ? true : config.dataThin; // 曲线强制抽稀
return config;
}, [configDependence, dataThinKey, activeTabKey]);
// 图表居中
const [curveCenter, chartGrid] = useMemo(() => {
const curveCenter = checkboxData.find((item) => item.key === 'curveCenter')?.checked;
const chartGrid = checkboxData.find((item) => item.key === 'chartGrid')?.checked;
return [curveCenter, chartGrid];
}, [checkboxData]);
// 自定义模式: 快速选择
const onCustomerTimeChange = (key) => {
setCustomerChecked(key);
!!customerTime && setCustomerTime(null);
};
// 自定义模式: 自定义时间选择
const onCustomerRangeChange = (value) => {
if (!value) {
// 时间清空，回到默认时间选择
setCustomerChecked(defaultChecked);
setCustomerTime(value);
} else {
setCustomerChecked(null);
setCustomerTime(value);
}
};
// 同期对比模式: 选择（日/月） // 自定义模式: 自定义时间选择
const onContrastChange = (value) => { const onCustomerRangeChange = (value) => {
setContrastOption(value); if (!value) {
setDatePickerArr([...DefaultDatePicker(value)]); // 时间清空，回到默认时间选择
}; setCustomerChecked(defaultChecked);
setCustomerTime(value);
} else {
setCustomerChecked(null);
setCustomerTime(value);
}
};
// 同期对比模式: 时间段选择 // 同期对比模式: 选择（日/月）
const onContrastPickerChange = (date, dateString, item) => { const onContrastChange = (value) => {
const arr = [...datePickerArr]; setContrastOption(value);
arr.forEach((child) => { setDatePickerArr([...DefaultDatePicker(value)]);
if (child.key === item.key) { };
child.value = date;
}
});
setDatePickerArr(arr);
};
// 同期对比模式: 新增日期选择组件
const handleAddDatePicker = () => {
setDatePickerArr([
...datePickerArr,
{
key: datePickerArr[datePickerArr.length - 1].key + 1,
value: '',
},
]);
};
// 同期对比模式: 删除日期选择组件
const handleDeleteDatePicker = (index) => {
const arr = [...datePickerArr];
arr.splice(index, 1);
setDatePickerArr(arr);
};
// 时间设置切换（自定义/同期对比）
const onTimeSetChange = (e) => {
setTimeValue(e.target.value);
if (e.target.value === 'contrast') {
// 同期对比
onContrastChange(contrastOption);
} else {
// 自定义
// 不需要处理
}
};
const renderTimeOption = () => { // 同期对比模式: 时间段选择
return ( const onContrastPickerChange = (date, dateString, item) => {
<div className={classNames(`${prefixCls}-date`)}> const arr = [...datePickerArr];
<div className={classNames(`${prefixCls}-label`)}>时间选择</div> arr.forEach((child) => {
<Radio.Group value={timeValue} onChange={onTimeSetChange}> if (child.key === item.key) {
<Radio.Button value="customer">自定义</Radio.Button> child.value = date;
<Radio.Button value="contrast">同期对比</Radio.Button> }
</Radio.Group> });
{timeValue === 'customer' && ( // 自定义 setDatePickerArr(arr);
<> };
<TimeRangePicker
onChange={onCustomerTimeChange}
value={customerChecked}
dataSource={timeList}
/>
<RangePicker
className={classNames(`${prefixCls}-custime-customer`)}
onChange={onCustomerRangeChange}
value={customerTime}
showTime
/>
</>
)}
{timeValue === 'contrast' && ( // 同期对比
<>
<Select value={contrastOption} style={{ width: 60 }} onChange={onContrastChange}>
<Option value="day">日</Option>
<Option value="month">月</Option>
</Select>
{datePickerArr.map((child, index) => (
<div key={child.key} className={classNames(`${prefixCls}-contrast-list`)}>
<div className={classNames(`${prefixCls}-contrast-wrap`)}>
<DatePicker
picker={contrastOption}
value={child.value}
onChange={(date, dateString) => onContrastPickerChange(date, dateString, child)}
/>
{datePickerArr.length > 2 && (
<div
className={classNames(`${prefixCls}-contrast-delete`)}
onClick={() => handleDeleteDatePicker(index)}
>
<CloseCircleFilled />
</div>
)}
</div>
{index < datePickerArr.length - 1 && (
<div className={classNames(`${prefixCls}-contrast-connect`)}>与</div>
)}
</div>
))}
{datePickerArr.length < 5 && <PlusCircleOutlined onClick={handleAddDatePicker} />}
</>
)}
</div>
);
};
// 曲线设置项选择/取消
const onCheckboxChange = (e, key) => {
let data = [...checkboxData];
let _index = data.findIndex((item) => item.key === 'justLine'); // 仅查看曲线会在勾选了数据滤波后展示
let _index1 = data.findIndex((item) => item.key === 'ignoreOutliers'); // 仅查看曲线会在勾选了数据滤波后展示
data.forEach((item) => {
if (item.key === key) {
item.checked = e.target.checked;
}
});
if (key === 'ignoreOutliers') {
data[_index].showInCurve = e.target.checked;
data[_index].checked = e.target.checked;
}
if (key === 'chartType') {
data[_index1].showInCurve = e.target.value;
data[_index1].checked = false;
data[_index].showInCurve = false;
data[_index].checked = false;
}
setCheckboxData(data);
};
// 数据抽稀时间间隔 // 同期对比模式: 新增日期选择组件
const onTimeIntervalChange = (value) => { const handleAddDatePicker = () => {
setDataThinKey(value); setDatePickerArr([
}; ...datePickerArr,
{
key: datePickerArr[datePickerArr.length - 1].key + 1,
value: '',
},
]);
};
const renderCheckbox = (child) => { // 同期对比模式: 删除日期选择组件
const curveAccess = activeTabKey === 'curve' && child.showInCurve; const handleDeleteDatePicker = (index) => {
const tableAccess = activeTabKey === 'table' && child.showInTable; const arr = [...datePickerArr];
const gridOptions = ['curveCenter']; arr.splice(index, 1);
setDatePickerArr(arr);
};
if (grid && curveAccess && gridOptions.indexOf(child.key) === -1) return null; // 时间设置切换（自定义/同期对比）
return ( const onTimeSetChange = (e) => {
(curveAccess || tableAccess) && ( setTimeValue(e.target.value);
<> if (e.target.value === 'contrast') {
<Checkbox checked={child.checked} onChange={(e) => onCheckboxChange(e, child.key)}> // 同期对比
{child.label} onContrastChange(contrastOption);
</Checkbox> } else {
{child.tooltip && ( // 自定义
<Tooltip title={child.tooltip}> // 不需要处理
<QuestionCircleFilled className={`${prefixCls}-question`} /> }
</Tooltip> };
)}
</>
)
);
};
const renderCurveOption = (isChart, isSingle) => { const renderTimeOption = () => {
return ( return (
<div className={classNames(`${prefixCls}-cover`)}> <div className={classNames(`${prefixCls}-date`)}>
{isChart && isSingle ? ( <div className={classNames(`${prefixCls}-label`)}>时间选择</div>
<> <Radio.Group value={timeValue} onChange={onTimeSetChange}>
<div className={classNames(`${prefixCls}-label`)}>曲线形态</div> <Radio.Button value="customer">自定义</Radio.Button>
<Radio.Group <Radio.Button value="contrast">同期对比</Radio.Button>
value={chartType} </Radio.Group>
style={{ marginRight: 16 }} {timeValue === 'customer' && ( // 自定义
onChange={(e) => { <>
let _value = e.target.value; <TimeRangePicker
setChartType(_value); onChange={onCustomerTimeChange}
onCheckboxChange({ target: { value: _value !== 'boxChart' } }, 'chartType'); value={customerChecked}
}} dataSource={timeList}
> />
<Radio.Button value={'lineChart'}>线形图</Radio.Button> <RangePicker
<Radio.Button value={'boxChart'}>箱线图</Radio.Button> className={classNames(`${prefixCls}-custime-customer`)}
</Radio.Group> onChange={onCustomerRangeChange}
</> value={customerTime}
) : ( showTime
'' />
)} </>
<div className={classNames(`${prefixCls}-label`)}>曲线设置</div> )}
{checkboxData.map((child) => { {timeValue === 'contrast' && ( // 同期对比
const box = renderCheckbox(child); <>
if (!box) return null; <Select value={contrastOption} style={{width: 60}} onChange={onContrastChange}>
return ( <Option value="day">日</Option>
<div key={child.key} className={`${prefixCls}-cover-item`}> <Option value="month">月</Option>
{box} </Select>
{datePickerArr.map((child, index) => (
<div key={child.key} className={classNames(`${prefixCls}-contrast-list`)}>
<div className={classNames(`${prefixCls}-contrast-wrap`)}>
<DatePicker
picker={contrastOption}
value={child.value}
onChange={(date, dateString) => onContrastPickerChange(date, dateString, child)}
/>
{datePickerArr.length > 2 && (
<div
className={classNames(`${prefixCls}-contrast-delete`)}
onClick={() => handleDeleteDatePicker(index)}
>
<CloseCircleFilled/>
</div>
)}
</div>
{index < datePickerArr.length - 1 && (
<div className={classNames(`${prefixCls}-contrast-connect`)}>与</div>
)}
</div>
))}
{datePickerArr.length < 5 && <PlusCircleOutlined onClick={handleAddDatePicker}/>}
</>
)}
</div> </div>
); );
})} };
{activeTabKey === 'table' && (
<Select
value={dataThinKey}
style={{ width: 90 }}
onChange={onTimeIntervalChange}
disabled={!dataConfig.dataThin}
>
{timeIntervalList.map((child) => (
<Option key={child.key} unit={child.unit} value={child.key}>
{child.name}
</Option>
))}
</Select>
)}
</div>
);
};
const exportExcelBtn = () => {
deviceParams.forEach((i, r) => {
let timeFrom = dateRange[r]?.dateFrom || moment().format(startFormat);
let timeTo = dateRange[r]?.dateTo || moment().format(timeFormat);
let fileName = `数据报表-${i.deviceType}-${i.deviceCode}-${moment(timeFrom).format(
dateFormat,
)}至${moment(timeTo).format(dateFormat)}`;
getExportDeviceHistoryUrl({
deviceType: i.deviceType,
deviceCode: i.deviceCode,
quotas: i.sensors,
startTime: timeFrom,
endTime: timeTo,
fileName: fileName,
})
.then((res) => {
if (res && res.code === -1) return message.error(res.msg);
const url = `${window.location.origin}/PandaCore/GCK/FileHandleContoller/Download/name?name=${res.data}&_site=${globalConfig?.userInfo?.site}`;
const aDom = document.createElement('a');
aDom.href = url;
aDom.click();
aDom.remove();
})
.catch((err) => {});
});
};
const handleTableData = (data) => { // 曲线设置项选择/取消
const ignoreOutliers = checkboxData.find((item) => item.key === 'ignoreOutliers').checked; const onCheckboxChange = (e, key) => {
const dataIndexAccess = (dataItem, index) => { let data = [...checkboxData];
const { stationCode, sensorName } = dataItem; let _index = data.findIndex(item => item.key === 'justLine'); // 仅查看曲线会在勾选了数据滤波后展示
return `${stationCode}-${sensorName}-${index}`; let _index1 = data.findIndex(item => item.key === 'ignoreOutliers'); // 仅查看曲线会在勾选了数据滤波后展示
data.forEach((item) => {
if (item.key === key) {
item.checked = e.target.checked;
}
});
if (key === 'ignoreOutliers') {
data[_index].showInCurve = e.target.checked;
data[_index].checked = e.target.checked;
}
if (key === 'chartType') {
data[_index1].showInCurve = e.target.value;
data[_index1].checked = false;
data[_index].showInCurve = false;
data[_index].checked = false;
}
setCheckboxData(data);
}; };
let format = timeFormat; // 数据抽稀时间间隔
if (timeValue === 'contrast') { const onTimeIntervalChange = (value) => {
format = contrastOption === 'day' ? '2020-01-01 HH:mm:00' : '2020-01-DD HH:mm:00'; setDataThinKey(value);
} };
// 处理表头数据 const renderCheckbox = (child) => {
const columnsData = data.map((item, index) => { const curveAccess = activeTabKey === 'curve' && child.showInCurve;
const { stationCode, equipmentName, sensorName, unit, dataModel } = item; const tableAccess = activeTabKey === 'table' && child.showInTable;
const dataIndex = dataIndexAccess(item, index); const gridOptions = ['curveCenter'];
let col = {
title: `${equipmentName}-${sensorName}${unit ? `(${unit})` : ''}`, if (grid && curveAccess && gridOptions.indexOf(child.key) === -1) return null;
dataIndex: dataIndex, return (
key: dataIndex, (curveAccess || tableAccess) && (
ellipsis: true, <>
align: 'center', <Checkbox checked={child.checked} onChange={(e) => onCheckboxChange(e, child.key)}>
}; {child.label}
// 同期对比 </Checkbox>
if (timeValue === 'contrast' && dataModel[0]) { {child.tooltip && (
const time = item.dataModel[0].pt <Tooltip title={child.tooltip}>
.slice(0, contrastOption === 'day' ? 10 : 7) <QuestionCircleFilled className={`${prefixCls}-question`}/>
.replace(/-/g, ''); </Tooltip>
col.title = `${equipmentName}-${sensorName}-${time}`; )}
} </>
return col; )
}); );
};
// 格式化时间对齐数据, 生成行数 const renderCurveOption = (isChart, isSingle) => {
const timeData = {}; return (
<div className={classNames(`${prefixCls}-cover`)} style={isChart && isSingle ? {width: '100%'} : {}}>
{
isChart && isSingle ? <>
<div className={classNames(`${prefixCls}-label`)}>曲线形态</div>
<Radio.Group value={chartType} style={{marginRight: 16}} onChange={(e) => {
let _value = e.target.value;
setChartType(_value);
onCheckboxChange({target: {value: _value !== 'boxChart'}}, 'chartType')
}}>
<Radio.Button value={'lineChart'}>线形图</Radio.Button>
<Radio.Button value={'boxChart'}>箱线图</Radio.Button>
</Radio.Group></> : ''
}
<div className={classNames(`${prefixCls}-label`)}>曲线设置</div>
{checkboxData.map((child) => {
const box = renderCheckbox(child);
if (!box) return null;
return (
<div key={child.key} className={`${prefixCls}-cover-item`}>
{box}
</div>
);
})}
{activeTabKey === 'table' && (
<Select
value={dataThinKey}
style={{width: 90}}
onChange={onTimeIntervalChange}
disabled={!dataConfig.dataThin}
>
{timeIntervalList.map((child) => (
<Option key={child.key} unit={child.unit} value={child.key}>
{child.name}
</Option>
))}
</Select>
)}
</div>
);
};
const buildDefaultData = (time) => { const exportExcelBtn = () => {
const obj = { key: time, time: time }; deviceParams.forEach((i, r) => {
data.forEach((item, index) => { let timeFrom = dateRange[r]?.dateFrom || moment().format(startFormat);
const dataIndex = dataIndexAccess(item, index); let timeTo = dateRange[r]?.dateTo || moment().format(timeFormat);
obj[dataIndex] = ''; let fileName = `数据报表-${i.deviceType}-${i.deviceCode}-${moment(timeFrom).format(
}); dateFormat,
return obj; )}至${moment(timeTo).format(dateFormat)}`;
getExportDeviceHistoryUrl({
deviceType: i.deviceType,
deviceCode: i.deviceCode,
quotas: i.sensors,
startTime: timeFrom,
endTime: timeTo,
fileName: fileName,
})
.then((res) => {
if (res && res.code === -1) return message.error(res.msg);
const url = `${window.location.origin}/PandaCore/GCK/FileHandleContoller/Download/name?name=${res.data}&_site=${globalConfig?.userInfo?.site}`;
const aDom = document.createElement('a');
aDom.href = url;
aDom.click();
aDom.remove();
})
.catch((err) => {
});
});
}; };
data.forEach((item, index) => {
const { stationCode, sensorName, dataModel } = item;
dataModel.forEach((data) => {
const formatTime = moment(data.pt).format(format);
let time = formatTime; const handleTableData = (data) => {
const ignoreOutliers = checkboxData.find((item) => item.key === 'ignoreOutliers').checked;
const dataIndexAccess = (dataItem, index) => {
const {stationCode, sensorName} = dataItem;
return `${stationCode}-${sensorName}-${index}`;
};
let format = timeFormat;
if (timeValue === 'contrast') { if (timeValue === 'contrast') {
time = time.slice(contrastOption === 'day' ? 11 : 8, 16); format = contrastOption === 'day' ? '2020-01-01 HH:mm:00' : '2020-01-DD HH:mm:00';
} }
timeData[formatTime] = timeData[formatTime] || buildDefaultData(time); // 处理表头数据
}); const columnsData = data.map((item, index) => {
}); const {stationCode, equipmentName, sensorName, unit, dataModel} = item;
const dataIndex = dataIndexAccess(item, index);
let col = {
title: `${equipmentName}-${sensorName}${unit ? `(${unit})` : ''}`,
dataIndex: dataIndex,
key: dataIndex,
ellipsis: true,
align: 'center',
};
// 同期对比
if (timeValue === 'contrast' && dataModel[0]) {
const time = item.dataModel[0].pt
.slice(0, contrastOption === 'day' ? 10 : 7)
.replace(/-/g, '');
col.title = `${equipmentName}-${sensorName}-${time}`;
}
return col;
});
// 处理表格数据 // 格式化时间对齐数据, 生成行数
data.forEach((child, index) => { const timeData = {};
const { dataModel } = child;
const dataIndex = dataIndexAccess(child, index); const buildDefaultData = (time) => {
dataModel.forEach((value, j) => { const obj = {key: time, time: time};
const formatTime = moment(value.pt).format(format); data.forEach((item, index) => {
const dataRow = timeData[formatTime]; const dataIndex = dataIndexAccess(item, index);
if (dataRow) { obj[dataIndex] = '';
dataRow[dataIndex] = value.pv === null || value.pv === undefined ? '' : value.pv; });
} return obj;
}); };
}); data.forEach((item, index) => {
const timeSort = (a, b) => { const {stationCode, sensorName, dataModel} = item;
let aa = a, dataModel.forEach((data) => {
bb = b; const formatTime = moment(data.pt).format(format);
if (timeValue === 'contrast') {
aa = a.slice(contrastOption === 'day' ? 11 : 8, 16); let time = formatTime;
bb = b.slice(contrastOption === 'day' ? 11 : 8, 16); if (timeValue === 'contrast') {
} time = time.slice(contrastOption === 'day' ? 11 : 8, 16);
return aa.localeCompare(bb); }
timeData[formatTime] = timeData[formatTime] || buildDefaultData(time);
});
});
// 处理表格数据
data.forEach((child, index) => {
const {dataModel} = child;
const dataIndex = dataIndexAccess(child, index);
dataModel.forEach((value, j) => {
const formatTime = moment(value.pt).format(format);
const dataRow = timeData[formatTime];
if (dataRow) {
dataRow[dataIndex] = value.pv === null || value.pv === undefined ? '' : value.pv;
}
});
});
const timeSort = (a, b) => {
let aa = a,
bb = b;
if (timeValue === 'contrast') {
aa = a.slice(contrastOption === 'day' ? 11 : 8, 16);
bb = b.slice(contrastOption === 'day' ? 11 : 8, 16);
}
return aa.localeCompare(bb);
};
const times = Object.keys(timeData).sort(timeSort);
const tableData = times.map((time) => timeData[time]);
setColumns([timeColumn, ...columnsData]);
setTableData(tableData);
}; };
const times = Object.keys(timeData).sort(timeSort);
const tableData = times.map((time) => timeData[time]); const [deviceAlarmSchemes, setDeviceAlarmSchemes] = useState([]);
setColumns([timeColumn, ...columnsData]); const beforChangeParams = (value = {}) => {
setTableData(tableData); if (!needMarkLine) return Promise.resolve();
}; return getDeviceAlarmScheme({
data: deviceParams.map((item) => ({
const [deviceAlarmSchemes, setDeviceAlarmSchemes] = useState([]); deviceType: item.deviceType,
const beforChangeParams = (value = {}) => { deviceCode: item.deviceCode,
if (!needMarkLine) return Promise.resolve(); pointAddressID: item.pointAddressID,
return getDeviceAlarmScheme({ sensorName: item.sensors,
data: deviceParams.map((item) => ({ })),
deviceType: item.deviceType, })
deviceCode: item.deviceCode, .then((res) => {
pointAddressID: item.pointAddressID, if (res.code === 0) setDeviceAlarmSchemes(res.data || []);
sensorName: item.sensors, else setDeviceAlarmSchemes([]);
})), return Promise.resolve();
}) })
.then((res) => { .catch((err) => {
if (res.code === 0) setDeviceAlarmSchemes(res.data || []); setDeviceAlarmSchemes([]);
else setDeviceAlarmSchemes([]); return Promise.resolve();
return Promise.resolve();
})
.catch((err) => {
setDeviceAlarmSchemes([]);
return Promise.resolve();
});
};
const handleDataThinKey = (diffDays) => {
// edit by zy 根据选择的时长控制抽稀频度
if (diffDays >= 7 && diffDays < 15) {
return { unit: 'h', zoom: '2' };
} else if (diffDays >= 15 && diffDays < 30) {
return { unit: 'h', zoom: '4' };
} else if (diffDays >= 30) {
return { unit: 'h', zoom: '6' };
} else if (diffDays < 7 && diffDays >= 2) {
return { unit: 'min', zoom: '40' };
} else if (diffDays < 2 && diffDays >= 1) {
return { unit: 'min', zoom: '30' };
} else {
return { unit: 'min', zoom: '10' };
}
};
// 处理接口服务参数的变化
const onChangeParams = (value = {}) => {
const { dateRange, isDilute, ignoreOutliers, zoom, unit } = value;
const requestArr = [];
const acrossTables = [];
deviceParams.forEach((i) => {
if (i.sensors && i.deviceCode && i.deviceCode)
acrossTables.push(_.omit(i, ['pointAddressID']));
});
if (!acrossTables?.length) {
handleTableData([]);
setChartDataSource([]);
return;
}
dateRange.forEach((item) => {
let _showLine = checkboxData.find((item) => item.key === 'justLine');
const param = {
isDilute,
zoom,
unit,
ignoreOutliers,
// isVertical: false, // 是否查询竖表
dateFrom: item.dateFrom,
dateTo: item.dateTo,
acrossTables,
isBoxPlots: isBoxPlots,
};
let diffDays = moment(item.dateTo).diff(moment(item.dateFrom), 'days');
let zoomParam = activeTabKey === 'curve' ? handleDataThinKey(diffDays) : {};
requestArr.push(getHistoryInfo({ ...param, ...zoomParam }));
});
setLoading(true);
Promise.all(requestArr).then((results) => {
if (results.length) {
let data = [];
results.forEach((res, index) => {
const { dateFrom, dateTo } = dateRange?.[index] ?? {};
if (res.code === 0 && res.data.length) {
debugger;
res.data.forEach((d) => {
d.dateFrom = dateFrom;
d.dateTo = dateTo;
}); });
deviceParams.forEach((p) => { };
// 返回数据按查询指标顺序排序
const sensors = p.sensors?.split(',') ?? []; const handleDataThinKey = (diffDays) => {
const list = sensors.map((s) => { // edit by zy 根据选择的时长控制抽稀频度
const dataItem = res.data.find( if (diffDays >= 7 && diffDays < 15) {
(d) => d.stationCode === p.deviceCode && d.sensorName === s, return {unit: 'h', zoom: '2'};
); } else if (diffDays >= 15 && diffDays < 30) {
dataItem.dateFrom = dateFrom; return {unit: 'h', zoom: '4'};
dataItem.dateTo = dateTo; } else if (diffDays >= 30) {
return dataItem; return {unit: 'h', zoom: '6'};
}); } else if (diffDays < 7 && diffDays >= 2) {
data = data.concat(list); return {unit: 'min', zoom: '40'};
} else if (diffDays < 2 && diffDays >= 1) {
return {unit: 'min', zoom: '30'};
} else {
return {unit: 'min', zoom: '10'};
}
};
// 处理接口服务参数的变化
const onChangeParams = (value = {}) => {
const {dateRange, isDilute, ignoreOutliers, zoom, unit} = value;
const requestArr = [];
const acrossTables = [];
deviceParams.forEach((i) => {
if (i.sensors && i.deviceCode && i.deviceCode)
acrossTables.push(_.omit(i, ['pointAddressID']));
});
if (!acrossTables?.length) {
handleTableData([]);
setChartDataSource([]);
return;
}
dateRange.forEach((item) => {
let _showLine = checkboxData.find(item => item.key === 'justLine');
const param = {
isDilute,
zoom,
unit,
ignoreOutliers,
// isVertical: false, // 是否查询竖表
dateFrom: item.dateFrom,
dateTo: item.dateTo,
acrossTables,
isBoxPlots: isBoxPlots
};
let diffDays = moment(item.dateTo).diff(moment(item.dateFrom), 'days');
let zoomParam = activeTabKey === 'curve' ? handleDataThinKey(diffDays) : {};
requestArr.push(getHistoryInfo({...param, ...zoomParam}));
});
setLoading(true);
Promise.all(requestArr).then((results) => {
if (results.length) {
let data = [];
results.forEach((res, index) => {
const {dateFrom, dateTo} = dateRange?.[index] ?? {};
if (res.code === 0 && res.data.length) {
res.data.forEach((d) => {
d.dateFrom = dateFrom;
d.dateTo = dateTo;
});
deviceParams.forEach((p) => {
// 返回数据按查询指标顺序排序
const sensors = p.sensors?.split(',') ?? [];
const list = sensors.map((s) => {
const dataItem = res.data.find(
(d) => d.stationCode === p.deviceCode && d.sensorName === s,
);
dataItem.dateFrom = dateFrom;
dataItem.dateTo = dateTo;
return dataItem;
});
data = data.concat(list);
});
}
});
setLoading(false);
handleTableData(data);
setChartDataSource(data);
}
});
};
useEffect(() => {
const {dataThin, ignoreOutliers, zoom, unit} = dataConfig;
beforChangeParams().finally(() => {
onChangeParams({
isDilute: dataThin,
ignoreOutliers,
zoom,
unit,
dateRange,
isBoxPlots: isBoxPlots
}); });
}
}); });
setLoading(false); }, [dateRange, dataConfig, deviceParams, chartType]);
handleTableData(data);
setChartDataSource(data); const renderPanel = (model) => {
} if (model === 'curve') {
}); return (
}; <>
<div className={`${prefixCls}-options`}>
useEffect(() => { {renderTimeOption()}
const { dataThin, ignoreOutliers, zoom, unit } = dataConfig; {renderCurveOption(true, (deviceParams?.length === 1 && deviceParams[0]?.sensors?.split(',').length === 1))}
beforChangeParams().finally(() => { </div>
onChangeParams({ <div className={`${prefixCls}-content`}>
isDilute: dataThin, {!chartDataSource.length ? (
ignoreOutliers, <PandaEmpty/>
zoom, ) : grid === true ? (
unit, <GridChart
dateRange, curveCenter={curveCenter}
isBoxPlots: isBoxPlots, prefixCls={prefixCls}
}); dataSource={chartDataSource}
}); contrast={timeValue === 'contrast'}
}, [dateRange, dataConfig, deviceParams, chartType]); contrastOption={contrastOption}
deviceAlarmSchemes={deviceAlarmSchemes}
const renderPanel = (model) => { />
if (model === 'curve') { ) : (
return ( <SimgleChart
<> curveCenter={curveCenter}
<div className={`${prefixCls}-options`}> showGridLine={chartGrid}
{renderTimeOption()} prefixCls={prefixCls}
{renderCurveOption( dataSource={chartDataSource}
true, justLine={!!checkboxData.find(item => item.key === 'justLine' && item.checked)}
deviceParams?.length === 1 && deviceParams[0]?.sensors?.split(',').length === 1, chartType={isBoxPlots ? chartType : null}
)} contrast={timeValue === 'contrast'}
</div> contrastOption={contrastOption}
<div className={`${prefixCls}-content`}> deviceAlarmSchemes={deviceAlarmSchemes}
{!chartDataSource.length ? ( />
<PandaEmpty /> )}
) : grid === true ? ( </div>
<GridChart </>
curveCenter={curveCenter} );
prefixCls={prefixCls} }
dataSource={chartDataSource} if (model === 'table') {
contrast={timeValue === 'contrast'} return (
contrastOption={contrastOption} <>
deviceAlarmSchemes={deviceAlarmSchemes} <div className={`${prefixCls}-options`}>
/> {renderTimeOption()}
) : ( {renderCurveOption()}
<SimgleChart </div>
curveCenter={curveCenter} <div className={`${prefixCls}-content`}>
showGridLine={chartGrid} {chartDataSource.length > 0 ? (
prefixCls={prefixCls} <BasicTable
dataSource={chartDataSource} dataSource={tableData}
justLine={!!checkboxData.find((item) => item.key === 'justLine' && item.checked)} columns={columns}
chartType={isBoxPlots ? chartType : null} {...tableProps}
contrast={timeValue === 'contrast'} pagination={false}
contrastOption={contrastOption} onChange={() => {
deviceAlarmSchemes={deviceAlarmSchemes} }}
/> />
)} ) : (
</div> <PandaEmpty/>
</> )}
); </div>
} </>
if (model === 'table') { );
return ( }
<> };
<div className={`${prefixCls}-options`}>
{renderTimeOption()} return (
{renderCurveOption()} <div className={classNames(prefixCls)}>
</div> <Spin spinning={loading} wrapperClassName={classNames(`${prefixCls}-spin`)}>
<div className={`${prefixCls}-content`}> {showModels.length === 1 && (
{chartDataSource.length > 0 ? ( <div className={`${prefixCls}-single-panel`}>{renderPanel(showModels[0])}</div>
<BasicTable )}
dataSource={tableData} {showModels.length > 1 && (
columns={columns} <Tabs
{...tableProps} activeKey={activeTabKey}
pagination={false} onChange={(key) => setActiveTabKey(key)}
onChange={() => {}} centered
/> tabBarExtraContent={{
) : ( left: <h3>{title}</h3>,
<PandaEmpty /> right: (
)} <div className={`${prefixCls}-extra-right`}>
</div> {activeTabKey === 'table' && (
</> <Button type="link" onClick={exportExcelBtn}>
); <DownloadOutlined/>
} 下载
}; </Button>
)}
return ( </div>
<div className={classNames(prefixCls)}> ),
<Spin spinning={loading} wrapperClassName={classNames(`${prefixCls}-spin`)}> }}
{showModels.length === 1 && ( >
<div className={`${prefixCls}-single-panel`}>{renderPanel(showModels[0])}</div> <Tabs.TabPane key="curve" tab="曲线">
)} {renderPanel('curve')}
{showModels.length > 1 && ( </Tabs.TabPane>
<Tabs <Tabs.TabPane key="table" tab="表格">
activeKey={activeTabKey} {renderPanel('table')}
onChange={(key) => setActiveTabKey(key)} </Tabs.TabPane>
centered </Tabs>
tabBarExtraContent={{ )}
left: <h3>{title}</h3>, </Spin>
right: ( </div>
<div className={`${prefixCls}-extra-right`}> );
{activeTabKey === 'table' && (
<Button type="link" onClick={exportExcelBtn}>
<DownloadOutlined />
下载
</Button>
)}
</div>
),
}}
>
<Tabs.TabPane key="curve" tab="曲线">
{renderPanel('curve')}
</Tabs.TabPane>
<Tabs.TabPane key="table" tab="表格">
{renderPanel('table')}
</Tabs.TabPane>
</Tabs>
)}
</Spin>
</div>
);
}; };
HistoryView.propTypes = { HistoryView.propTypes = {
grid: PropTypes.bool, grid: PropTypes.bool,
title: PropTypes.string, title: PropTypes.string,
defaultChecked: PropTypes.oneOf(['twelveHours', 'roundClock', 'oneWeek', 'oneMonth']), defaultChecked: PropTypes.oneOf(['twelveHours', 'roundClock', 'oneWeek', 'oneMonth']),
tableProps: PropTypes.object, tableProps: PropTypes.object,
deviceParams: PropTypes.arrayOf( deviceParams: PropTypes.arrayOf(
PropTypes.objectOf({ PropTypes.objectOf({
deviceCode: PropTypes.string, deviceCode: PropTypes.string,
sensors: PropTypes.string, sensors: PropTypes.string,
deviceType: PropTypes.string, deviceType: PropTypes.string,
pointAddressID: PropTypes.number, // 可选，配置了将会查询相关报警方案配置 pointAddressID: PropTypes.number, // 可选，配置了将会查询相关报警方案配置
}), }),
), ),
defaultModel: PropTypes.oneOf(['curve', 'table']), defaultModel: PropTypes.oneOf(['curve', 'table']),
showModels: PropTypes.arrayOf(PropTypes.oneOf(['curve', 'table'])), showModels: PropTypes.arrayOf(PropTypes.oneOf(['curve', 'table'])),
}; };
HistoryView.defaultProps = { HistoryView.defaultProps = {
grid: false, grid: false,
title: '指标曲线', title: '指标曲线',
defaultChecked: 'roundClock', defaultChecked: 'roundClock',
tableProps: {}, tableProps: {},
defaultModel: 'curve', defaultModel: 'curve',
showModels: ['curve', 'table'], showModels: ['curve', 'table'],
needMarkLine: true, needMarkLine: true,
}; };
export default HistoryView; export default HistoryView;
packages/extend-components/EC_HistoryView/src/utils.js
View file @ 8c7dd0a4
...@@ -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