|
@@ -62,8 +62,8 @@
|
62
|
62
|
</el-table-column>
|
63
|
63
|
<el-table-column prop="Membehips" label="輸贏合計">
|
64
|
64
|
</el-table-column>
|
65
|
|
- <el-table-column prop="ass" label="福利">
|
66
|
|
- </el-table-column>
|
|
65
|
+ <!-- <el-table-column prop="ass" label="福利">
|
|
66
|
+ </el-table-column> -->
|
67
|
67
|
<el-table-column prop="MemberRecord.GambleMember.chips" label="最終積分">
|
68
|
68
|
</el-table-column>
|
69
|
69
|
</el-table-column>
|
|
@@ -173,7 +173,7 @@ export default {
|
173
|
173
|
dealingTemp = response.data.rows.filter(record => {
|
174
|
174
|
return record.door !== -1
|
175
|
175
|
})
|
176
|
|
- let deal = {}
|
|
176
|
+ let deal = {}
|
177
|
177
|
dealingTemp.map((record, index) => {
|
178
|
178
|
if (index % 6 === 0) {
|
179
|
179
|
deal.door_0 = record.door
|
|
@@ -185,17 +185,17 @@ export default {
|
185
|
185
|
deal.point1_1 = record.point1
|
186
|
186
|
deal.point2_1 = record.point2
|
187
|
187
|
deal.totalPoints_1 = record.totalPoints
|
188
|
|
- }else if (index % 6 === 2) {
|
|
188
|
+ } else if (index % 6 === 2) {
|
189
|
189
|
deal.door_2 = record.door
|
190
|
190
|
deal.point1_2 = record.point1
|
191
|
191
|
deal.point2_2 = record.point2
|
192
|
192
|
deal.totalPoints_2 = record.totalPoints
|
193
|
|
- }else if (index % 6 === 3) {
|
|
193
|
+ } else if (index % 6 === 3) {
|
194
|
194
|
deal.door_3 = record.door
|
195
|
195
|
deal.point1_3 = record.point1
|
196
|
196
|
deal.point2_3 = record.point2
|
197
|
197
|
deal.totalPoints_3 = record.totalPoints
|
198
|
|
- }else if (index % 6 === 4) {
|
|
198
|
+ } else if (index % 6 === 4) {
|
199
|
199
|
deal.door_4 = record.door
|
200
|
200
|
deal.point1_4 = record.point1
|
201
|
201
|
deal.point2_4 = record.point2
|
|
@@ -219,9 +219,13 @@ export default {
|
219
|
219
|
|
220
|
220
|
this.group = _.groupBy(detailTemp, record => {
|
221
|
221
|
return record.MemberRecord.GambleMember.name
|
222
|
|
- })
|
|
222
|
+ })
|
|
223
|
+ this.group = Object.values(this.group)
|
|
224
|
+
|
|
225
|
+ this.detail = this.group.reduce(function(arr, element) {
|
|
226
|
+ return arr.concat(element);
|
|
227
|
+ }, []);
|
223
|
228
|
|
224
|
|
- this.group = _.values(this.group)
|
225
|
229
|
const sum = (i) => {
|
226
|
230
|
let count = 0
|
227
|
231
|
for (let j = 0; j < i; j++) {
|
|
@@ -253,11 +257,8 @@ export default {
|
253
|
257
|
}`
|
254
|
258
|
}
|
255
|
259
|
}
|
|
260
|
+
|
256
|
261
|
this.func = eval(`(function() {${this.statement}})`)
|
257
|
|
- detailTemp.map(record => {
|
258
|
|
- this.detail.push(record)
|
259
|
|
- })
|
260
|
|
- this.detail = _.sortBy(this.detail, 'MemberRecord.GambleMember.name')
|
261
|
262
|
})
|
262
|
263
|
|
263
|
264
|
this.listLoading = false
|