romove Gamrbucket presistence

src/views/gambleGameBucket/detail/index.vue

@@ -5,7 +5,7 @@
       <el-row :gutter="20">
         <el-col :span="6">
           <span class="demonstration">關數</span>
-          <el-select @change='handleFilter' style="width: 120px" class="filter-item" v-model="query.secondLayer.round" placeholder="關">
+          <el-select @change='handleFilter' style="width: 120px" class="filter-item" v-model="listQuery.round" placeholder="關">
           <el-option v-for="item in roundOptions" :key="item.label" :label="item.label" :value="item.key">
           </el-option>
         </el-select>
@@ -166,6 +166,9 @@ export default {
     return {
       list: null,
       listLoading: true,
+      listQuery: { 
+        round: 1 
+      }, 
       detail: [],
       group: [],
       statement: '',
@@ -186,7 +189,7 @@ export default {
     }
   },
   created() {
-    fetchRoundRecord(this.data.secondLayer, this.query.secondLayer).then(response => {
+    fetchRoundRecord(this.data.secondLayer, this.listQuery).then(response => {
       this.door = response.data.initialDoor
     })
     // fetchGameBid(this.data.secondLayer).then(response => {
@@ -204,23 +207,23 @@ export default {
     ...mapGetters([
       'visible',
       'data',
-      'query'
+      // 'query'
     ])
   },
   methods: {
     ...mapActions([
       'SetVisible',
       'SetData',
-      'SetQuery'
+      // 'SetQuery'
     ]),
     getList() {
       this.listLoading = true
       let detailTemp, dealingTemp, memberRecordTemp
       this.detail = []
-      fetchWagerRecord(this.data.secondLayer, this.query.secondLayer).then(response => {
+      fetchWagerRecord(this.data.secondLayer, this.listQuery).then(response => {
         this.wagerRecord = response.data
       })
-      fetchDealingRecords(this.data.secondLayer, this.query.secondLayer).then(response => {
+      fetchDealingRecords(this.data.secondLayer, this.listQuery).then(response => {
         dealingTemp = response.data.rows.filter(record => {
           return record.door !== -1
         })
@@ -239,14 +242,14 @@ export default {
           }
         })
       })
-      fetchMemberRecords(this.data.secondLayer, this.query.secondLayer).then(response => {
+      fetchMemberRecords(this.data.secondLayer, this.listQuery).then(response => {
         this.memberRecordTemp = response.data.rows
         let memberRecordTemp = _.groupBy(response.data.rows, record => {
           return record.door
         })
         this.memberRecord = Object.values(memberRecordTemp )
       })
-      fetchDetails(this.data.secondLayer, this.query.secondLayer).then(response => {
+      fetchDetails(this.data.secondLayer, this.listQuery).then(response => {
         detailTemp = response.data.rows.filter(record => {
           return record.DealingRecord.door !== -1 &&
             record.MemberRecord.door !== -1 &&
@@ -372,10 +375,10 @@ export default {
       return sums
     },
     handleFilter() {
-      fetchRoundRecord(this.data.secondLayer, this.query.secondLayer).then(response => {
+      fetchRoundRecord(this.data.secondLayer, this.listQuery).then(response => {
         this.door = response.data.initialDoor
       })
-      this.SetQuery({layer:2, query: {round: this.query.secondLayer.round}})      
+      // this.SetQuery({layer:2, query: {round: this.query.secondLayer.round}})      
       this.dealing = []
       this.getList()
     },

src/views/gambleGameBucket/index.vue

@@ -2,7 +2,7 @@
 <div class="app-container calendar-list-container">
   <div class="app-container" v-show="visible.firstLayer">
     <div class="app-container">
-      <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="莊家" v-model="query.firstLayer.bookie">
+      <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="莊家" v-model="listQuery.bookie">
       </el-input>
       <el-date-picker
         v-model="date"
@@ -42,8 +42,8 @@
     </el-table>
 
     <div v-show="!listLoading" class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="query.firstLayer.page"
-        :page-sizes="[10,20,30, 50]" :page-size="query.firstLayer.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.page"
+        :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>
   </div>
@@ -68,13 +68,13 @@ export default {
       listLoading: true,
       total: null,
       // bucket: '',
-      // listQuery: {
-      //   page: 1,
-      //   limit: 20,
-      //   startAt: null,
-      //   endAt: null,
-      //   bookie: null
-      // },
+      listQuery: {
+        page: 1,
+        limit: 20,
+        startAt: null,
+        endAt: null,
+        bookie: null
+      },
       // temp: {},
       pickerOptions: {
         shortcuts: [{
@@ -104,21 +104,21 @@ export default {
   computed: {
     ...mapGetters([
       'visible',
-      'query',
+      // 'query',
       'data',
-      'p_date'
+      // 'p_date'
     ])
   },
   methods: {
     ...mapActions([
       'SetVisible',
       'SetData',
-      'SetQuery',
-      'SetDate'
+      // 'SetQuery',
+      // 'SetDate'
     ]),
     getList() {
       this.listLoading = true
-      fetchList(this.query.firstLayer).then(response => {
+      fetchList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = response.data.count
         this.listLoading = false
@@ -137,37 +137,32 @@ export default {
       this.SetData({layer:2, data: temp})
     },
     handleFilter() {
-      if (this.p_date) {
-        this.SetQuery({layer:1, query: {page: 1, bookie: this.query.firstLayer.bookie, startAt: moment.utc(this.p_date[0]).format(), endAt: moment.utc(this.p_date[1]).format()}})      
+      this.listQuery.page = 1 
+      if (this.date) { 
+        this.listQuery.startAt = moment.utc(this.date[0]).format() 
+        this.listQuery.endAt = moment.utc(this.date[1]).format()     
       } else {
-         this.SetQuery({layer:1, query: {page: 1, bookie: this.query.firstLayer.bookie,startAt: null, endAt: null}})  
+        this.listQuery.startAt = null 
+        this.listQuery.endAt = null 
       }
       this.getList()
     },
     handleSizeChange(val) {
-      if (this.p_date) {
-        this.SetQuery({layer:1, query: {limit: val, bookie: this.query.firstLayer.bookie, startAt: moment.utc(this.p_date[0]).format(), endAt: moment.utc(this.p_date[1]).format()}})      
-      } else {
-        this.SetQuery({layer:1, query: {limit: val, bookie: this.query.firstLayer.bookie,startAt: null, endAt: null}})  
-      }
+      this.listQuery.limit = val 
       this.getList()
     },
     handleCurrentChange(val) {
-      if (this.p_date) {
-        this.SetQuery({layer:1, query: {page: val, bookie: this.query.firstLayer.bookie, startAt: moment.utc(this.p_date[0]).format(), endAt: moment.utc(this.p_date[1]).format()}})      
-      } else {
-        this.SetQuery({layer:1, query: {page: val, bookie: this.query.firstLayer.bookie,startAt: null, endAt: null}})  
-      }
+      this.listQuery.page = val 
       this.getList()
     },
     moment(time) {
       return moment(time).tz('Asia/Taipei').format('YYYY-MM-DD HH:mm:ss')
     }
   },
-  watch: {
-    'date': function(val) {
-     this.SetDate(val)
-    }
-  }
+  // watch: {
+  //   'date': function(val) {
+  //    this.SetDate(val)
+  //   }
+  // }
 }
 </script>