Browse Source

feat:fix bugs

dev
zhaobing’ 1 year ago
parent
commit
f54b86ad20
  1. 6
      api/app/lib/controllers/monitor/index.js
  2. 2
      web/client/src/sections/data/containers/dataTableComponent.jsx

6
api/app/lib/controllers/monitor/index.js

@ -147,10 +147,8 @@ 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 }
})
})
}

2
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>

Loading…
Cancel
Save