From f54b86ad2097611355adecc4bb9dfcc79ccb4354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?zhaobing=E2=80=99?= <zhao.bin@free-sun.com.cn>
Date: Wed, 15 Nov 2023 15:29:16 +0800
Subject: [PATCH] feat:fix bugs

---
 api/app/lib/controllers/monitor/index.js                  | 8 +++-----
 .../src/sections/data/containers/dataTableComponent.jsx   | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/api/app/lib/controllers/monitor/index.js b/api/app/lib/controllers/monitor/index.js
index 2959d96..e2196d4 100644
--- a/api/app/lib/controllers/monitor/index.js
+++ b/api/app/lib/controllers/monitor/index.js
@@ -147,11 +147,9 @@ async function getMonitorData(ctx) {
          factorsList.map(item => {
             factors = item.ItemNames.split(',')
             factorNames = item.Items.split(',')
-            factors.map(child => {
-               factorNames.map(p => {
-                  items[p] = { name: child, unit: item.ItemUnits }
-               })
-            })
+            factors.map((child,index)=> {
+               items[factorNames[index]] = { name: child, unit: item.ItemUnits }
+          })
          })
       }
       //设备数据+数据
diff --git a/web/client/src/sections/data/containers/dataTableComponent.jsx b/web/client/src/sections/data/containers/dataTableComponent.jsx
index 7707b06..743fce7 100644
--- a/web/client/src/sections/data/containers/dataTableComponent.jsx
+++ b/web/client/src/sections/data/containers/dataTableComponent.jsx
@@ -123,7 +123,7 @@ const DataTableComponent = (props) => {
                                     data.length ? <Button type="ghost" onClick={exporting}>导出</Button> : null
                                 }
                  </p> */}
-                <Table dataSource={data} columns={columns} pagination={{ current: currentPage, onChange:pageChange }} />
+                <Table dataSource={data} columns={columns}  />
                 </div>
             </Spin>
         </div>