Commit 2debffab authored by 陈龙's avatar 陈龙

feat: 优化泳道图破线问题;优化特征值下载表格;优化表格样式

parent 5f2f41eb
......@@ -6,9 +6,6 @@
display: none;
}
.ant-table-thead > tr > th {
}
.virtual-table-cell {
box-sizing: border-box;
padding: 16px;
......
......@@ -81,6 +81,7 @@ const deviceParams = [
"sensors": "沉淀池投矾量瞬时,",
"deviceType": "加矾间"
}, */
{
"deviceCode": "QSBF00000001",
"sensors": "取水浊度",
......@@ -120,6 +121,12 @@ const deviceParams = [
"sensors": "出1累计流量",
"deviceType": "二供泵房"
}*/
// 永吉
/* {
"deviceCode": "SZJCY00000001",
"sensors": "pH",
"deviceType": "水质监测仪"
}*/
];
const Demo = () => {
......
......@@ -884,7 +884,11 @@ const HistoryView = (props) => {
let _titleWidth = [];
let _title = _columns.map((item) => {
_dataIndex.push(item.dataIndex);
let _titleStr = [item.name, item.title].filter((item) => item).join('-');
let _titleArr = [item.name, item.title];
if (item.title.includes(item.name)) {
_titleArr = [item.title];
}
let _titleStr = _titleArr.filter((item) => item).join('-');
_titleWidth.push(_titleStr.length * 1);
return _titleStr;
});
......@@ -1117,6 +1121,28 @@ const HistoryView = (props) => {
res.data.forEach((d) => {
d.dateFrom = dateFrom || '';
d.dateTo = dateTo || '';
/**
* @Date: 2023年10月25日
* @description: 数据连续补点之后,首值、尾值、最大值、最小值不会补,都为null。
* 为保证显示,将补点之后的数据的首值、尾值、最大值、最小值同时为null的情况变更为点的值。
* 请注意,此项为重要变更,此变更会影响原始数据。
* */
d.dataModel = d.dataModel.map(item => {
let {firstPV, lastPV, maxPV, minPV, pv} = item;
if (firstPV === null && lastPV === null && maxPV === null && minPV === null) {
firstPV = pv;
lastPV = pv;
maxPV = pv;
minPV = pv;
}
return {
...item,
firstPV,
lastPV,
maxPV,
minPV,
}
})
});
deviceParams.forEach((p) => {
// 返回数据按查询指标顺序排序
......
......@@ -22,7 +22,9 @@
width: 82px;
white-space: nowrap;
}
.@{ant-prefix}-table-thead > tr > th {
background: rgba(224, 234, 251,0.4);
}
&-extra-right {
position: absolute;
top: 10px;
......
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