Commit 07536788 authored by 陈龙's avatar 陈龙

fix: 修复频率业务问题

parent 81f42fa3
......@@ -11,18 +11,19 @@ const deviceParams = [
deviceType: '熊猫二供泵房',
pointAddressID: 208,
},*/
/* {
deviceCode: 'EGJZ00000197',
// sensors: '进水压力,出水瞬时流量,出水累计流量',
sensors: '1#变频器运行频率',
deviceType: '二供机组',
// pointAddressID: 208,
}*/
/* {
/* {
"deviceCode": "SYJ00000008",
"sensors": "瞬时流量",
"deviceType": "水源井"
},*/
{
deviceCode: 'EGJZ00000197',
sensors: '进水压力,出水压力,出水瞬时流量,出水累计流量',
// sensors: '1#变频器运行频率',
deviceType: '二供机组',
// pointAddressID: 208,
}
/* {
// deviceCode: 'EGBF00000002',
// deviceCode: 'EGBF00000018',
......@@ -76,11 +77,11 @@ const deviceParams = [
// "sensors": "沉淀池1号进水管流量",
// "deviceType": "絮凝沉淀池"
// }
{
/* {
"deviceCode": "LLJ00000001",
"sensors": "瞬时流量",
"deviceType": "流量计"
}
}*/
/*邳州*/
/* {
deviceCode: 'EGJZ00000027',
......
......@@ -1001,10 +1001,6 @@ const HistoryView = (props) => {
if (dataItem) {
dataItem.dateFrom = dateFrom || '';
dataItem.dateTo = dateTo || '';
// 抽稀情况下,剔除掉为null的点
/* if (zoomArray[index]?.unit !== '' && zoomArray[index]?.zoom !== '') {
dataItem.dataModel = dataItem.dataModel.filter(item => item.pv !== null)
}*/
return dataItem;
} else {
return {};
......@@ -1190,11 +1186,11 @@ const HistoryView = (props) => {
}
// 查点表配置
if (_res1.code === 0) {
let _sensorConfig = _res1.data.find(item => item.name.trim() === sensors.trim());
let _statusName = _sensorConfig.statusName;
let _sensorConfig = _res1.data.find(item => item?.name.trim() === sensors.trim());
let _statusName = _sensorConfig?.statusName;
if (_statusName) {
let _statusConfig = _res1.data.find(item => item.name.trim() === _statusName.trim());
let _valDesc = _statusConfig.valDesc;
let _statusConfig = _res1.data.find(item => item?.name.trim() === _statusName.trim());
let _valDesc = _statusConfig?.valDesc||'';
setSpecial1({
name: _statusName,
valDesc: _valDesc.split(';').reduce((final, cur) => {
......
......@@ -613,9 +613,9 @@ const handleYAxis = ({dataSource, needUnit, curveCenter, showGridLine}) => {
type: 'value',
name: needUnit ? unit : null,
position: i % 2 === 0 ? 'left' : 'right',
offset: Math.floor(i / 2) * AXIS_WIDTH,
offset: Math.floor(i / 2) * 80,
axisLabel: {
formatter: (value) => (value > 100000 ? `${(value / 1000).toFixed(2)}k` : value.toFixed(2)),
formatter: (value) => (value > 10000 ? `${(value / 1000).toFixed(1)}k` : value.toFixed(1)),
},
axisLine: {
show: true,
......
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