Browse Source

TODO table

EthnaYeh 7 years ago
parent
commit
8700f139c5
2 changed files with 34 additions and 11 deletions
  1. 8 0
      src/api/gambleGameBucket.js
  2. 26 11
      src/views/gambleGameBucket/detail/index.vue

+ 8 - 0
src/api/gambleGameBucket.js

29
     method: 'get'
29
     method: 'get'
30
   })
30
   })
31
 }
31
 }
32
+
33
+export function fetchDetails(data) {
34
+  const round = 1
35
+  return request({
36
+    url: `/gambleGameBuckets/${data.id}/round/${round}/detail`,
37
+    method: 'get'
38
+  })
39
+}

+ 26 - 11
src/views/gambleGameBucket/detail/index.vue

1
 <template>
1
 <template>
2
 <div class="app-container calendar-list-container">
2
 <div class="app-container calendar-list-container">
3
   <div class="app-container">
3
   <div class="app-container">
4
-    <el-table :data="memberRecords" :span-method="objectSpanMethod" border style="width: 100% margin-top: 20px">
5
-      <el-table-column prop="GambleMember.name" label="玩家" width="180">
4
+    <el-table :data="detail" :span-method="objectSpanMethod" border style="width: 100% margin-top: 20px">
5
+      <el-table-column prop="MemberRecord.GambleMember.name" label="玩家" width="180">
6
       </el-table-column>
6
       </el-table-column>
7
-      <el-table-column prop="door" label="押">
7
+      <el-table-column prop="MemberRecord.door" label="押">
8
       </el-table-column>
8
       </el-table-column>
9
-      <el-table-column prop="totalPoints" label="點數">
9
+      <el-table-column prop="MemberRecord.wager" label="額度">
10
       </el-table-column>
10
       </el-table-column>
11
-      <el-table-column prop="earned" label="輸贏">
11
+      <el-table-column prop="DealingRecord.totalPoints" label="點數">
12
+      </el-table-column>
13
+      <el-table-column prop="MemberRecord.earned" label="輸贏">
12
       </el-table-column>
14
       </el-table-column>
13
       <el-table-column prop="amount3" label="抽水">
15
       <el-table-column prop="amount3" label="抽水">
14
       </el-table-column>
16
       </el-table-column>
15
-      <el-table-column prop="sss" label="輸贏合計">
17
+      <el-table-column prop="Membehips" label="輸贏合計">
16
       </el-table-column>
18
       </el-table-column>
17
       <el-table-column prop="amount3" label="福利">
19
       <el-table-column prop="amount3" label="福利">
18
       </el-table-column>
20
       </el-table-column>
19
-      <el-table-column prop="GambleMember.chips" label="最終積分">
21
+      <el-table-column prop="MemberRecord.GambleMember.chips" label="最終積分">
20
       </el-table-column>
22
       </el-table-column>
21
     </el-table>
23
     </el-table>
22
   </div>
24
   </div>
24
 </template>
26
 </template>
25
 
27
 
26
 <script>
28
 <script>
27
-import { fetchList, fetchMemberRecords, fetchDealingRecords } from '@/api/gambleGameBucket'
29
+import { fetchDetails, fetchMemberRecords, fetchDealingRecords } from '@/api/gambleGameBucket'
28
 import _ from 'lodash'
30
 import _ from 'lodash'
29
 
31
 
30
 export default {
32
 export default {
36
       memberRecords: [],
38
       memberRecords: [],
37
       dealingRecords: [],
39
       dealingRecords: [],
38
       groupMember: [],
40
       groupMember: [],
39
-      // Marray: [],
41
+      detail: [],
40
     }
42
     }
41
   },
43
   },
42
   props: [ 'bucket' ],
44
   props: [ 'bucket' ],
46
   methods: {
48
   methods: {
47
     getList() {
49
     getList() {
48
       this.listLoading = true
50
       this.listLoading = true
49
-      let memberTemp ,dealingTemp ,group 
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
+      })
50
       fetchMemberRecords(this.bucket).then(response => {
64
       fetchMemberRecords(this.bucket).then(response => {
51
         memberTemp = response.data.rows.filter(record => {
65
         memberTemp = response.data.rows.filter(record => {
52
           return record.door !== -1
66
           return record.door !== -1
74
       this.listLoading = false
88
       this.listLoading = false
75
     },
89
     },
76
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
90
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
77
-      if (columnIndex === 0 || columnIndex === 4|| columnIndex === 5|| columnIndex === 6|| columnIndex === 7) {
91
+      if (columnIndex === 0 || columnIndex === 5|| columnIndex === 6|| columnIndex === 7|| columnIndex === 8) {
78
         this.groupMember
92
         this.groupMember
93
+        console.log(rowIndex)
79
         if (rowIndex % 6 === 0) {
94
         if (rowIndex % 6 === 0) {
80
           return {
95
           return {
81
             rowspan: 6,
96
             rowspan: 6,