|
@@ -163,6 +163,7 @@
|
|
|
ref="table"
|
|
ref="table"
|
|
|
row-key="id"
|
|
row-key="id"
|
|
|
:columns="columns"
|
|
:columns="columns"
|
|
|
|
|
+ @columns-change="handleColumnChange"
|
|
|
:datasource="datasource"
|
|
:datasource="datasource"
|
|
|
:cache-key="cacheKeyUrl"
|
|
:cache-key="cacheKeyUrl"
|
|
|
autoAmendPage
|
|
autoAmendPage
|
|
@@ -476,7 +477,10 @@
|
|
|
if (this.pageName == 'fullYearCollection') {
|
|
if (this.pageName == 'fullYearCollection') {
|
|
|
if (res.list.length) {
|
|
if (res.list.length) {
|
|
|
res.list = res.list[0].dataList.map((item) => {
|
|
res.list = res.list[0].dataList.map((item) => {
|
|
|
- let data = { substanceName: item.substanceName, energyClassificationName: item.energyClassificationName };
|
|
|
|
|
|
|
+ let data = {
|
|
|
|
|
+ substanceName: item.substanceName,
|
|
|
|
|
+ energyClassificationName: item.energyClassificationName
|
|
|
|
|
+ };
|
|
|
for (let key in item.yearDataMap) {
|
|
for (let key in item.yearDataMap) {
|
|
|
data[key] = item.yearDataMap[key] || '';
|
|
data[key] = item.yearDataMap[key] || '';
|
|
|
}
|
|
}
|