|
|
@@ -2,21 +2,21 @@
|
|
2
|
2
|
<div class="app-container calendar-list-container">
|
|
3
|
3
|
<div class="app-container">
|
|
4
|
4
|
<el-table :data="memberRecords" :span-method="objectSpanMethod" border style="width: 100% margin-top: 20px">
|
|
5
|
|
- <el-table-column prop="id" label="玩家" width="180">
|
|
|
5
|
+ <el-table-column prop="GambleMember.name" label="玩家" width="180">
|
|
6
|
6
|
</el-table-column>
|
|
7
|
|
- <el-table-column prop="name" label="押">
|
|
|
7
|
+ <el-table-column prop="door" label="押">
|
|
8
|
8
|
</el-table-column>
|
|
9
|
|
- <el-table-column prop="amount1" label="點數">
|
|
|
9
|
+ <el-table-column prop="totalPoints" label="點數">
|
|
10
|
10
|
</el-table-column>
|
|
11
|
|
- <el-table-column prop="amount2" label="輸贏">
|
|
|
11
|
+ <el-table-column prop="earned" label="輸贏">
|
|
12
|
12
|
</el-table-column>
|
|
13
|
13
|
<el-table-column prop="amount3" label="抽水">
|
|
14
|
14
|
</el-table-column>
|
|
15
|
|
- <el-table-column prop="amount3" label="輸贏合計">
|
|
|
15
|
+ <el-table-column prop="sss" label="輸贏合計">
|
|
16
|
16
|
</el-table-column>
|
|
17
|
17
|
<el-table-column prop="amount3" label="福利">
|
|
18
|
18
|
</el-table-column>
|
|
19
|
|
- <el-table-column prop="amount3" label="最終積分">
|
|
|
19
|
+ <el-table-column prop="GambleMember.chips" label="最終積分">
|
|
20
|
20
|
</el-table-column>
|
|
21
|
21
|
</el-table>
|
|
22
|
22
|
</div>
|
|
|
@@ -25,6 +25,7 @@
|
|
25
|
25
|
|
|
26
|
26
|
<script>
|
|
27
|
27
|
import { fetchList, fetchMemberRecords, fetchDealingRecords } from '@/api/gambleGameBucket'
|
|
|
28
|
+import _ from 'lodash'
|
|
28
|
29
|
|
|
29
|
30
|
export default {
|
|
30
|
31
|
data() {
|
|
|
@@ -32,8 +33,10 @@ export default {
|
|
32
|
33
|
list: null,
|
|
33
|
34
|
listLoading: true,
|
|
34
|
35
|
total: null,
|
|
35
|
|
- memberRecords: '',
|
|
36
|
|
- dealingRecords: ''
|
|
|
36
|
+ memberRecords: [],
|
|
|
37
|
+ dealingRecords: [],
|
|
|
38
|
+ groupMember: [],
|
|
|
39
|
+ // Marray: [],
|
|
37
|
40
|
}
|
|
38
|
41
|
},
|
|
39
|
42
|
props: [ 'bucket' ],
|
|
|
@@ -43,26 +46,39 @@ export default {
|
|
43
|
46
|
methods: {
|
|
44
|
47
|
getList() {
|
|
45
|
48
|
this.listLoading = true
|
|
|
49
|
+ let memberTemp ,dealingTemp ,group
|
|
46
|
50
|
fetchMemberRecords(this.bucket).then(response => {
|
|
47
|
|
- this.memberRecords = response.data.rows
|
|
48
|
|
- // console.log(response.data.rows)
|
|
|
51
|
+ memberTemp = response.data.rows.filter(record => {
|
|
|
52
|
+ return record.door !== -1
|
|
|
53
|
+ })
|
|
|
54
|
+ group = _.groupBy(memberTemp, record => {
|
|
|
55
|
+ return record.GambleMember.name;
|
|
|
56
|
+ });
|
|
|
57
|
+ this.groupMember = _.values(group)
|
|
|
58
|
+ console.log('temp', this.groupMember)
|
|
|
59
|
+ memberTemp.map(record => {
|
|
|
60
|
+ this.memberRecords.push(record)
|
|
|
61
|
+ })
|
|
49
|
62
|
})
|
|
50
|
63
|
fetchDealingRecords(this.bucket).then(response => {
|
|
51
|
|
- this.dealingRecords = response.data.rows
|
|
52
|
|
- // console.log(response.data.rows)
|
|
53
|
|
- })
|
|
54
|
|
- console.log('wss', this.dealingRecords )
|
|
55
|
|
-
|
|
56
|
|
- this.dealingRecords.map(record => {
|
|
57
|
|
- console.log('w',record)
|
|
|
64
|
+ dealingTemp = response.data.rows.filter(record => {
|
|
|
65
|
+ return record.door !== -1
|
|
|
66
|
+ })
|
|
|
67
|
+ response.data.rows.map(record => {
|
|
|
68
|
+ this.dealingRecords.push(record)
|
|
|
69
|
+ })
|
|
58
|
70
|
})
|
|
|
71
|
+ console.log('memberRecords', this.memberRecords )
|
|
|
72
|
+ console.log('dealingRecords', this.dealingRecords)
|
|
|
73
|
+
|
|
59
|
74
|
this.listLoading = false
|
|
60
|
75
|
},
|
|
61
|
76
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|
|
62
|
|
- if (columnIndex === 0) {
|
|
63
|
|
- if (rowIndex % 3 === 0) {
|
|
|
77
|
+ if (columnIndex === 0 || columnIndex === 4|| columnIndex === 5|| columnIndex === 6|| columnIndex === 7) {
|
|
|
78
|
+ this.groupMember
|
|
|
79
|
+ if (rowIndex % 6 === 0) {
|
|
64
|
80
|
return {
|
|
65
|
|
- rowspan: 3,
|
|
|
81
|
+ rowspan: 6,
|
|
66
|
82
|
colspan: 1
|
|
67
|
83
|
}
|
|
68
|
84
|
} else {
|
