xuziqiang/SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

Browse Source
This commit is contained in:
zhaohy
2024-08-13 17:30:33 +08:00
parent b89794d8be 7799bac74a
commit f18dad74e7
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hx-ai-intelligent/src/view/monitor/energyMonitor/analysisTable/index.vue
View File

@@ -36,53 +36,65 @@
{
title: '设备/节点',
dataIndex: 'name',
align: 'center',
},
{
title: '统计值',
dataIndex: 'value',
align: 'center',
},
{
title: '同比',
align: 'center',
children: [
{
title: '△差值',
dataIndex: 'yoyDiff',
align: 'center',
},
{
title: '增长率',
dataIndex: 'yoyRate',
align: 'center',
},
],
},
{
title: '环比',
align: 'center',
children: [
{
title: '△差值',
dataIndex: 'momDiff',
align: 'center',
},
{
title: '增长率',
dataIndex: 'momRate',
align: 'center',
},
],
},
{
title: '纵向对比',
align: 'center',
children: [
{
title: '△差值',
dataIndex: 'zongxiangDiff',
align: 'center',
},
{
title: '增长率',
dataIndex: 'zongxiangRate',
align: 'center',
},
],
},
{
title: '操作',
align: 'center',
// dataIndex: 'date',
},
];

4
hx-ai-intelligent/src/view/monitor/energyMonitor/graphTable/index.vue
View File

@@ -89,6 +89,7 @@
{
title: '设备/组名',
dataIndex: 'name',
align: 'center',
customCell: (record, rowIndex) => {
if (rowIndex == undefined) {
return {
@@ -110,6 +111,7 @@
},
{
title: '参数名称',
align: 'center',
dataIndex: 'selectedValueName',
customCell: (record, rowIndex) => {
if (rowIndex == undefined) {
@@ -144,7 +146,7 @@
let columnA: any[] = [...column];
let columnB: any[] = [];
pageData.graphTableColumns.forEach((item) => {
columnB.push({ title: item, dataIndex: item });
columnB.push({ title: item, dataIndex: item, align: 'center' });
});
columnA.push(...columnB);
columns.value = columnA;