diff --git a/src/views/page/historyData.vue b/src/views/page/historyData.vue index f72e22d..a5d77ca 100644 --- a/src/views/page/historyData.vue +++ b/src/views/page/historyData.vue @@ -45,7 +45,7 @@ - {{ scope.row['data' + index] }} + {{ scope.row[item] }} @@ -327,22 +327,18 @@ export default { this.tableData = [] this.total = res.data.data.totalCount res.data.data.data[0].equipment.forEach((el, index) => { - this.tableList.push(el.environmentDataId + '(' + el.formula - + ')') + this.tableList.push(el.environmentDataId + '(' + el.formula+ ')') }) - res.data.data.data.forEach((el, index) => { const processedData = { time: el.updateTime }; el.equipment.forEach((item, index) => { - processedData[`data${index}`] = item.environmentData; + processedData[item.environmentDataId + '(' + item.formula+ ')'] = item.environmentData; }); this.tableData.push(processedData) }) - - } }) },