|
@@ -49,27 +49,28 @@ export default {
|
49
|
49
|
getList() {
|
50
|
50
|
this.listLoading = true
|
51
|
51
|
let memberTemp ,dealingTemp ,group ,detailTemp
|
52
|
|
- fetchDetails(this.bucket).then(reponse => {
|
53
|
|
- dealingTemp = reponse.data.rows.filter(record => {
|
54
|
|
- return record.DealingRecord.door !== -1 &&
|
55
|
|
- record.MemberRecord.door !== -1 &&
|
56
|
|
- record.MemberRecord.door === record.DealingRecord.door
|
57
|
|
- })
|
58
|
|
- dealingTemp = _.sortBy(dealingTemp, 'MemberRecord.GambleMember.name');
|
59
|
|
- dealingTemp.map(record => {
|
60
|
|
- this.detail.push(record)
|
61
|
|
- })
|
62
|
|
- console.log(this.detail)
|
63
|
|
- })
|
64
|
52
|
fetchMemberRecords(this.bucket).then(response => {
|
65
|
53
|
memberTemp = response.data.rows.filter(record => {
|
66
|
|
- return record.door !== -1
|
|
54
|
+ return record.door >= 1 && record.door <= 6
|
67
|
55
|
})
|
68
|
56
|
group = _.groupBy(memberTemp, record => {
|
69
|
57
|
return record.GambleMember.name;
|
70
|
58
|
});
|
71
|
|
- this.groupMember = _.values(group)
|
72
|
|
- console.log('temp', this.groupMember)
|
|
59
|
+ // this.groupMember = _.values(group)
|
|
60
|
+ // console.log('temp', this.groupMember)
|
|
61
|
+ group = _.values(group)
|
|
62
|
+ // console.log('temp', group)
|
|
63
|
+ group.map(person => {
|
|
64
|
+ // console.log('preson',preson)
|
|
65
|
+ if(person.length !== 6){
|
|
66
|
+ for(let i = 1 ; i<7 ;i++){
|
|
67
|
+ if(! _.find(person, {door: i})){
|
|
68
|
+ // 補上 lost
|
|
69
|
+ let tempObj = Object.assign({}, person[0])
|
|
70
|
+ }
|
|
71
|
+ }
|
|
72
|
+ }
|
|
73
|
+ })
|
73
|
74
|
memberTemp.map(record => {
|
74
|
75
|
this.memberRecords.push(record)
|
75
|
76
|
})
|
|
@@ -82,6 +83,50 @@ export default {
|
82
|
83
|
this.dealingRecords.push(record)
|
83
|
84
|
})
|
84
|
85
|
})
|
|
86
|
+ fetchDetails(this.bucket).then(reponse => {
|
|
87
|
+ let group
|
|
88
|
+ dealingTemp = reponse.data.rows.filter(record => {
|
|
89
|
+ return record.DealingRecord.door >= 1 && record.DealingRecord.door <= 6 &&
|
|
90
|
+ record.MemberRecord.door >= 1 && record.MemberRecord.door <= 6 &&
|
|
91
|
+ record.MemberRecord.door === record.DealingRecord.door
|
|
92
|
+ })
|
|
93
|
+ console.log('dddd',this.detail)
|
|
94
|
+
|
|
95
|
+ group = _.groupBy(dealingTemp, record => {
|
|
96
|
+ return record.MemberRecord.GambleMember.name;
|
|
97
|
+ });
|
|
98
|
+ // this.groupMember = _.values(group)
|
|
99
|
+ // console.log('temp', this.groupMember)
|
|
100
|
+ group = _.values(group)
|
|
101
|
+ console.log('temp', group)
|
|
102
|
+
|
|
103
|
+
|
|
104
|
+ group.map(person => {
|
|
105
|
+ // console.log('preson',preson)
|
|
106
|
+ if(person.length !== 6){
|
|
107
|
+ console.log('hi')
|
|
108
|
+ for(let i = 1 ; i<7 ;i++){
|
|
109
|
+ console.log(i)
|
|
110
|
+ if(! _.find(person, {MemberRecord:{door: i}})){
|
|
111
|
+ // 補上 lost
|
|
112
|
+ let tempObj = Object.assign({}, person[0])
|
|
113
|
+ tempObj.DealingRecord.door = i
|
|
114
|
+ tempObj.MemberRecord.door = i
|
|
115
|
+ console.log('lost',i,tempObj)
|
|
116
|
+ this.detail.push(tempObj)
|
|
117
|
+ }
|
|
118
|
+ }
|
|
119
|
+ }
|
|
120
|
+ })
|
|
121
|
+
|
|
122
|
+ // dealingTemp = _.sortBy(dealingTemp, 'MemberRecord.GambleMember.name');
|
|
123
|
+ dealingTemp.map(record => {
|
|
124
|
+ this.detail.push(record)
|
|
125
|
+ })
|
|
126
|
+ console.log('ccc',this.detail)
|
|
127
|
+ this.detail = _.sortBy(this.detail, 'MemberRecord.GambleMember.name');
|
|
128
|
+ console.log('AAA',this.detail)
|
|
129
|
+ })
|
85
|
130
|
console.log('memberRecords', this.memberRecords )
|
86
|
131
|
console.log('dealingRecords', this.dealingRecords)
|
87
|
132
|
|
|
@@ -90,7 +135,6 @@ export default {
|
90
|
135
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|
91
|
136
|
if (columnIndex === 0 || columnIndex === 5|| columnIndex === 6|| columnIndex === 7|| columnIndex === 8) {
|
92
|
137
|
this.groupMember
|
93
|
|
- console.log(rowIndex)
|
94
|
138
|
if (rowIndex % 6 === 0) {
|
95
|
139
|
return {
|
96
|
140
|
rowspan: 6,
|