Przeglądaj źródła

TODO finish table

EthnaYeh 7 lat temu
rodzic
commit
95a6fc5880
2 zmienionych plików z 37 dodań i 20 usunięć
  1. 1 0
      package.json
  2. 36 20
      src/views/gambleGameBucket/detail/index.vue

+ 1 - 0
package.json

15
     "axios": "0.17.1",
15
     "axios": "0.17.1",
16
     "element-ui": "2.0.5",
16
     "element-ui": "2.0.5",
17
     "js-cookie": "2.2.0",
17
     "js-cookie": "2.2.0",
18
+    "lodash": "^4.17.4",
18
     "normalize.css": "7.0.0",
19
     "normalize.css": "7.0.0",
19
     "nprogress": "0.2.0",
20
     "nprogress": "0.2.0",
20
     "vue": "2.5.9",
21
     "vue": "2.5.9",

+ 36 - 20
src/views/gambleGameBucket/detail/index.vue

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">
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
       </el-table-column>
6
       </el-table-column>
7
-      <el-table-column prop="name" label="押">
7
+      <el-table-column prop="door" label="押">
8
       </el-table-column>
8
       </el-table-column>
9
-      <el-table-column prop="amount1" label="點數">
9
+      <el-table-column prop="totalPoints" label="點數">
10
       </el-table-column>
10
       </el-table-column>
11
-      <el-table-column prop="amount2" label="輸贏">
11
+      <el-table-column prop="earned" label="輸贏">
12
       </el-table-column>
12
       </el-table-column>
13
       <el-table-column prop="amount3" label="抽水">
13
       <el-table-column prop="amount3" label="抽水">
14
       </el-table-column>
14
       </el-table-column>
15
-      <el-table-column prop="amount3" label="輸贏合計">
15
+      <el-table-column prop="sss" label="輸贏合計">
16
       </el-table-column>
16
       </el-table-column>
17
       <el-table-column prop="amount3" label="福利">
17
       <el-table-column prop="amount3" label="福利">
18
       </el-table-column>
18
       </el-table-column>
19
-      <el-table-column prop="amount3" label="最終積分">
19
+      <el-table-column prop="GambleMember.chips" label="最終積分">
20
       </el-table-column>
20
       </el-table-column>
21
     </el-table>
21
     </el-table>
22
   </div>
22
   </div>
25
 
25
 
26
 <script>
26
 <script>
27
 import { fetchList, fetchMemberRecords, fetchDealingRecords } from '@/api/gambleGameBucket'
27
 import { fetchList, fetchMemberRecords, fetchDealingRecords } from '@/api/gambleGameBucket'
28
+import _ from 'lodash'
28
 
29
 
29
 export default {
30
 export default {
30
   data() {
31
   data() {
32
       list: null,
33
       list: null,
33
       listLoading: true,
34
       listLoading: true,
34
       total: null,
35
       total: null,
35
-      memberRecords: '',
36
-      dealingRecords: ''
36
+      memberRecords: [],
37
+      dealingRecords: [],
38
+      groupMember: [],
39
+      // Marray: [],
37
     }
40
     }
38
   },
41
   },
39
   props: [ 'bucket' ],
42
   props: [ 'bucket' ],
43
   methods: {
46
   methods: {
44
     getList() {
47
     getList() {
45
       this.listLoading = true
48
       this.listLoading = true
49
+      let memberTemp ,dealingTemp ,group 
46
       fetchMemberRecords(this.bucket).then(response => {
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
       fetchDealingRecords(this.bucket).then(response => {
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
       this.listLoading = false
74
       this.listLoading = false
60
     },
75
     },
61
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
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
           return {
80
           return {
65
-            rowspan: 3,
81
+            rowspan: 6,
66
             colspan: 1
82
             colspan: 1
67
           }
83
           }
68
         } else {
84
         } else {