Browse Source

feat:fix bugs

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

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

@ -147,11 +147,9 @@ async function getMonitorData(ctx) {
factorsList.map(item => { factorsList.map(item => {
factors = item.ItemNames.split(',') factors = item.ItemNames.split(',')
factorNames = item.Items.split(',') factorNames = item.Items.split(',')
factors.map(child => { factors.map((child,index)=> {
factorNames.map(p => { items[factorNames[index]] = { name: child, unit: item.ItemUnits }
items[p] = { 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 data.length ? <Button type="ghost" onClick={exporting}>导出</Button> : null
} }
</p> */} </p> */}
<Table dataSource={data} columns={columns} pagination={{ current: currentPage, onChange:pageChange }} /> <Table dataSource={data} columns={columns} />
</div> </div>
</Spin> </Spin>
</div> </div>

Loading…
Cancel
Save