From b6a2e0e17aefe5e57eb3a73243adc762f463c8b3 Mon Sep 17 00:00:00 2001
From: sunmeng <1162067978@qq.com>
Date: Mon, 25 Nov 2024 11:37:48 +0800
Subject: [PATCH] 1

---
 src/views/page/historyData.vue | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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 @@
                     <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)
                     })
-
-
                 }
             })
         },
-- 
2.40.1