Bladeren bron

Game door table add door master

Unknown 7 jaren geleden
bovenliggende
commit
aa49ab87dd
1 gewijzigde bestanden met toevoegingen van 17 en 12 verwijderingen
  1. 17 12
      src/views/gambleGameBucket/detail/index.vue

+ 17 - 12
src/views/gambleGameBucket/detail/index.vue

21
       <el-table-column label="本期開獎" align="center"> 
21
       <el-table-column label="本期開獎" align="center"> 
22
         <el-table-column label="名稱">
22
         <el-table-column label="名稱">
23
           <template slot-scope="scope">
23
           <template slot-scope="scope">
24
-            <span>{{scope.$index=== 0 ?"點數":"ddd"}}</span>
24
+            <span>{{scope.$index === 0 ?"點數":"門主"}}</span>
25
           </template>
25
           </template>
26
         </el-table-column>   
26
         </el-table-column>   
27
         <el-table-column label="第一門">
27
         <el-table-column label="第一門">
28
           <template slot-scope="scope">
28
           <template slot-scope="scope">
29
-            <span>{{doorTableSwitch(scope.$index, 1)}}</span>
29
+            <span>{{doorTableSwitch(scope.$index, 0)}}</span>
30
           </template>
30
           </template>
31
         </el-table-column>
31
         </el-table-column>
32
         <el-table-column label="第二門">
32
         <el-table-column label="第二門">
33
           <template slot-scope="scope">
33
           <template slot-scope="scope">
34
-            <span>{{`${scope.row.point1_1} | ${scope.row.point2_1} / ${scope.row.totalPoints_1}`}}</span>
34
+            <span>{{doorTableSwitch(scope.$index, 1)}}</span>
35
           </template>
35
           </template>
36
         </el-table-column>
36
         </el-table-column>
37
         <el-table-column label="第三門">
37
         <el-table-column label="第三門">
38
           <template slot-scope="scope">
38
           <template slot-scope="scope">
39
-            <span>{{`${scope.row.point1_2} | ${scope.row.point2_2} / ${scope.row.totalPoints_2}`}}</span>
39
+            <span>{{doorTableSwitch(scope.$index, 2)}}</span>
40
           </template>
40
           </template>
41
         </el-table-column>
41
         </el-table-column>
42
         <el-table-column label="第四門">
42
         <el-table-column label="第四門">
43
           <template slot-scope="scope">
43
           <template slot-scope="scope">
44
-            <span>{{`${scope.row.point1_3} | ${scope.row.point2_3} / ${scope.row.totalPoints_3}`}}</span>
44
+            <span>{{doorTableSwitch(scope.$index, 3)}}</span>
45
           </template>
45
           </template>
46
         </el-table-column>
46
         </el-table-column>
47
         <el-table-column label="第五門">
47
         <el-table-column label="第五門">
48
           <template slot-scope="scope">
48
           <template slot-scope="scope">
49
-            <span>{{`${scope.row.point1_4} | ${scope.row.point2_4} / ${scope.row.totalPoints_4}`}}</span>
49
+            <span>{{doorTableSwitch(scope.$index, 4)}}</span>
50
           </template>
50
           </template>
51
         </el-table-column>
51
         </el-table-column>
52
         <el-table-column label="第六門">
52
         <el-table-column label="第六門">
53
           <template slot-scope="scope">
53
           <template slot-scope="scope">
54
-            <span>{{`${scope.row.point1_5} | ${scope.row.point2_5} / ${scope.row.totalPoints_5}`}}</span>
54
+            <span>{{doorTableSwitch(scope.$index, 5)}}</span>
55
           </template>
55
           </template>
56
         </el-table-column>
56
         </el-table-column>
57
       </el-table-column>      
57
       </el-table-column>      
216
         })
216
         })
217
 
217
 
218
         const deal = {}
218
         const deal = {}
219
+        const member = {}        
219
         dealingTemp.map((record, index) => {
220
         dealingTemp.map((record, index) => {
220
           deal[`door_${index % 6}`] = record.door
221
           deal[`door_${index % 6}`] = record.door
221
           deal[`point1_${index % 6}`] = record.point1
222
           deal[`point1_${index % 6}`] = record.point1
222
           deal[`point2_${index % 6}`] = record.point2
223
           deal[`point2_${index % 6}`] = record.point2
223
           deal[`totalPoints_${index % 6}`] = record.totalPoints
224
           deal[`totalPoints_${index % 6}`] = record.totalPoints
224
-          record.GambleMember ? deal[`member_${index % 6}`] = record.GambleMember.name : false
225
-          index % 6 === 5 ? this.dealing.push(deal) : false
225
+          record.GambleMember ? member[`member_${index % 6}`] = record.GambleMember.name : false
226
+          if( index % 6 === 5) {
227
+            this.dealing.push(deal)
228
+            this.dealing.push(member)
229
+          }
226
         })
230
         })
227
       })
231
       })
228
       fetchMemberRecords(this.bucket, this.listQuery).then(response => {
232
       fetchMemberRecords(this.bucket, this.listQuery).then(response => {
307
     getSummaries() {
311
     getSummaries() {
308
       const sums = []
312
       const sums = []
309
       this.memberRecord.map((group, index) => {
313
       this.memberRecord.map((group, index) => {
310
-        if (index === 0) sums[index] = '每門總押注'
314
+        if (index === 0) sums[index] = '總押注'
311
         let doorTotal = 0
315
         let doorTotal = 0
312
         group.map((door) => {
316
         group.map((door) => {
313
           doorTotal += door.wager
317
           doorTotal += door.wager
326
     moneyColor(money) {
330
     moneyColor(money) {
327
       return money >= 0 ? { color: '#67C23A' } : { color: '#FA5555' }
331
       return money >= 0 ? { color: '#67C23A' } : { color: '#FA5555' }
328
     },
332
     },
333
+    // TODO refactor
329
     doorTableSwitch(rowIndex, colIndex) {
334
     doorTableSwitch(rowIndex, colIndex) {
330
       console.log('sss',this.dealing)
335
       console.log('sss',this.dealing)
331
       console.log(this.dealing[0][`point1_${colIndex}`])
336
       console.log(this.dealing[0][`point1_${colIndex}`])
332
       if(rowIndex === 0){
337
       if(rowIndex === 0){
333
-        return this.dealing[`point1_${colIndex}`] + '|' + this.dealing[`point2_${colIndex}`] + '/' + this.dealing[`totalPoints_${colIndex}`]
338
+        return `${this.dealing[0][`point1_${colIndex}`]} | ${this.dealing[0][`point2_${colIndex}`]} / ${this.dealing[0][`totalPoints_${colIndex}`]}`
334
       }
339
       }
335
       if(rowIndex === 1){
340
       if(rowIndex === 1){
336
-        return 
341
+        return this.dealing[1][`member_${colIndex}`] ? `${this.dealing[1][`member_${colIndex}`]}` : 'N/A' 
337
       }
342
       }
338
     },
343
     },
339
     _sum(i) {
344
     _sum(i) {