|
@@ -120,14 +120,16 @@ class Header extends React.Component {
|
120
|
120
|
key: x.sceneType,
|
121
|
121
|
})
|
122
|
122
|
})
|
123
|
|
- const data = (e.list || []).reduce((acc, item, index) => {
|
|
123
|
+ const data = (e.list || []).reduce((acc, item) => {
|
124
|
124
|
const { sceneType, fromNum, registeredNum, createTime } = item
|
125
|
125
|
const num = this.state.userType === 'registered' ? registeredNum : fromNum
|
126
|
|
- acc[index] = { ...item, [`${sceneType}`]: !num ? 0 : num }
|
|
126
|
+ acc[createTime] = { ...acc[createTime], ...item, [`${sceneType}`]: !num ? 0 : num }
|
127
|
127
|
return acc
|
128
|
|
- }, [])
|
|
128
|
+ }, {})
|
129
|
129
|
|
130
|
|
- this.setState({ tableData: data })
|
|
130
|
+ const tableData = Object.keys(data).map(k => data[k])
|
|
131
|
+
|
|
132
|
+ this.setState({ tableData })
|
131
|
133
|
|
132
|
134
|
}
|
133
|
135
|
|