finish table

src/views/gambleGameBucket/detail/index.vue

@@ -39,6 +39,13 @@ export default {
       dealingRecords: [],
       groupMember: [],
       detail: [],
+      group: [],
+      statement: '',
+      row: 0,
+      col: 0,
+      func: '',
+      rowIndex: 0,
+      colIndex: 0
     }
   },
   props: [ 'bucket' ],
@@ -48,46 +55,13 @@ export default {
   methods: {
     getList() {
       this.listLoading = true
-      let memberTemp ,dealingTemp ,group ,detailTemp
-      fetchMemberRecords(this.bucket).then(response => {
-        memberTemp = response.data.rows.filter(record => {
-          return record.door >= 1 && record.door <= 6
-        })
-        group = _.groupBy(memberTemp, record => {
-          return record.GambleMember.name;
-        });
-        // this.groupMember = _.values(group)
-        // console.log('temp', this.groupMember)
-        group = _.values(group)
-        // console.log('temp', group)
-        group.map(person => {
-          // console.log('preson',preson)
-          if(person.length !== 6){
-            for(let i = 1 ; i<7 ;i++){
-              if(! _.find(person, {door: i})){
-                // 補上 lost
-                let tempObj = Object.assign({}, person[0])
-              }
-            }
-          }
-        })
-        memberTemp.map(record => {
-          this.memberRecords.push(record)
-        })
-      })
-      fetchDealingRecords(this.bucket).then(response => {
-        dealingTemp = response.data.rows.filter(record => {
-          return record.door !== -1
-        })
-        response.data.rows.map(record => {
-          this.dealingRecords.push(record)
-        })
-      })
+      let group ,detailTemp
+
       fetchDetails(this.bucket).then(reponse => {
-        let group
+        let group, dealingTemp
         dealingTemp = reponse.data.rows.filter(record => {
-          return  record.DealingRecord.door >= 1 && record.DealingRecord.door <= 6 && 
-            record.MemberRecord.door >= 1 && record.MemberRecord.door <= 6 &&
+          return  record.DealingRecord.door !== -1 && 
+            record.MemberRecord.door !== -1 &&
             record.MemberRecord.door === record.DealingRecord.door
         })
         console.log('dddd',this.detail)
@@ -95,56 +69,60 @@ export default {
         group = _.groupBy(dealingTemp, record => {
           return record.MemberRecord.GambleMember.name;
         });
-        // this.groupMember = _.values(group)
-        // console.log('temp', this.groupMember)
-        group = _.values(group)
-        console.log('temp', group)
 
-
-        group.map(person => {
-          // console.log('preson',preson)
-          if(person.length !== 6){
-            console.log('hi')
-            for(let i = 1 ; i<7 ;i++){
-              console.log(i)
-              if(! _.find(person, {MemberRecord:{door: i}})){
-                // 補上 lost
-                let tempObj = Object.assign({}, person[0])
-                tempObj.DealingRecord.door = i
-                tempObj.MemberRecord.door = i
-                console.log('lost',i,tempObj)
-                this.detail.push(tempObj)
-              }
-            }
+        this.group = _.values(group)
+        const sum = (i) => {
+          let count = 0
+          for(let j=0 ;j<i ;j++){
+            count += this.group[j].length
           }
-        })
-
-        // dealingTemp = _.sortBy(dealingTemp, 'MemberRecord.GambleMember.name');
+          return count
+        }
+        for(let i = 0 ;i < this.group.length ;i++){
+          console.log(this.group)
+          if(i === 0) {
+            this.statement = 
+            `if(this.rowIndex === ${i}){
+              this.row = ${this.group[i].length},
+              this.col = 1
+            }`
+          }else if(i === this.group.length-1){
+            this.statement += 
+            `else if(this.rowIndex === ${sum(i)}){
+              this.row = ${this.group[i].length},
+              this.col = 1
+            }else {
+              this.row = 0,
+              this.col = 0
+            }`
+          }else {
+            this.statement += 
+            `else if(this.rowIndex === ${sum(i)}){
+              this.row = ${this.group[i].length},
+              this.col = 1 
+            }`
+          }
+        }
+        console.log(this.statement)
+        this.func = eval(`(function() {${this.statement}})`)
         dealingTemp.map(record => {
           this.detail.push(record)
         })
-        console.log('ccc',this.detail)
         this.detail =  _.sortBy(this.detail, 'MemberRecord.GambleMember.name');
-        console.log('AAA',this.detail)
       })
-      console.log('memberRecords', this.memberRecords )
-      console.log('dealingRecords', this.dealingRecords)
 
       this.listLoading = false
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0 || columnIndex === 5|| columnIndex === 6|| columnIndex === 7|| columnIndex === 8) {
-        this.groupMember
-        if (rowIndex % 6 === 0) {
-          return {
-            rowspan: 6,
-            colspan: 1
-          }
-        } else {
-          return {
-            rowspan: 0,
-            colspan: 0
-          }
+        this.rowIndex = rowIndex
+        this.columnIndex = columnIndex
+        const that = this
+
+        this.func()      
+        return {
+          rowspan: this.row,
+          colspan: this.col
         }
       }
     }