xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '1' (#194) from pc-master into portal 

Reviewed-on: #194
portal
xiaomeng 2024-11-25 04:44:30 +00:00
parent bb892c0a9a b6a2e0e17a
commit 34c0f24488
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/page/historyData.vue
View File

@ -45,7 +45,7 @@
<el-table-column min-width='180' prop="time" label="时间"></el-table-column>
<el-table-column min-width='150' :label="item" v-for="item, index in tableList" :key="index">
<template slot-scope="scope">
<div>{{ scope.row['data' + index] }}</div>
<div>{{ scope.row[item] }}</div>
</template>
</el-table-column>
@ -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)
})
}
})
},