Merge remote-tracking branch 'origin/master'

front/admin-front/src/views/autoplay/index.vue

@@ -263,8 +263,13 @@
             <el-pagination
               small
               layout="prev, pager, next"
-              :page-size="10"
-              :total="3">
+              :hide-on-single-page="false"
+              :page-size="table.pageSize"
+              :total="table.total"
+              :current-page.sync="table.page"
+              @current-change="pageChange"
+            >
+
             </el-pagination>
           </div>
         </div>
@@ -398,8 +403,11 @@
             <el-pagination
               small
               layout="prev, pager, next"
-              :page-size="10"
-              :total="3">
+              :hide-on-single-page="false"
+              :page-size="viewRecordDetailsTable.pageSize"
+              :total="viewRecordDetailsTable.total"
+              :current-page.sync="viewRecordDetailsTable.page"
+              @current-change="viewRecordDetailsPageChange">
             </el-pagination>
           </div>
         </div>
@@ -524,8 +532,11 @@
             <el-pagination
               small
               layout="prev, pager, next"
-              :page-size="10"
-              :total="3">
+              :hide-on-single-page="false"
+              :page-size="viewRecordDetailsTable.pageSize"
+              :total="viewRecordDetailsTable.total"
+              :current-page.sync="viewRecordDetailsTable.page"
+              @current-change="viewRecordDetailsPageChange">
             </el-pagination>
           </div>
         </div>
@@ -674,8 +685,11 @@
             <el-pagination
               small
               layout="prev, pager, next"
-              :page-size="10"
-              :total="3">
+              :hide-on-single-page="false"
+              :page-size="viewRecordDetailsTable.pageSize"
+              :total="viewRecordDetailsTable.total"
+              :current-page.sync="viewRecordDetailsTable.page"
+              @current-change="viewRecordDetailsPageChange">
             </el-pagination>
           </div>
         </div>
@@ -995,7 +1009,17 @@ export default {
         taskCode: ''
       },
       addTaskProjectData: [],
-      confirmLoading:false
+      confirmLoading:false,
+      table:{
+        pageSize:10,
+        page:1,
+        total:0
+      },
+      viewRecordDetailsTable:{
+        pageSize:10,
+        page:1,
+        total:0
+      }
     }
   },
   mounted() {
@@ -1003,7 +1027,27 @@ export default {
     this.getWalletAddress()
   },
   methods: {
+    pageChange(page) {
+      this.table.page = page
+      let params = {
+        page: this.table.page,
+        pageSize: 10,
+        queryValue: this.currentTaskInfo.amsTaskId
+      }
+      getExecutionRecord(params).then((res) => {
+        this.drawerRecord = true
+        this.recordData = res.records
+        this.table.page = res.page
+        this.table.pageSize = res.pageSize
+        this.table.total = res.total
+      })
+    },
+    viewRecordDetailsPageChange(page){
+      this.viewRecordDetailsTable.page = page
+      this.refresh()
+    },
     progressBarDetails(item) {
+      console.log(item);
       this.drawerRecord = true
       this.drawerRecordStatus = 1
       this.currentTaskInfo = JSON.parse(JSON.stringify(item))
@@ -1011,6 +1055,7 @@ export default {
       this.currentRecordData.intervalMax = item.intervalMax
       this.currentRecordData.intervalMin = item.intervalMin
       this.currentRecordData.maxGas = item.maxGas
+      this.currentRecordData.executeId = item.executeId
       let params = {
         page: 1,
         pageSize: 10,
@@ -1019,6 +1064,9 @@ export default {
       getInteractionRecord(params).then(res => {
         this.ongoingData = res.records
         this.ongoingDataTotal = res.total
+        this.viewRecordDetailsTable.page = res.page
+        this.viewRecordDetailsTable.pageSize = res.pageSize
+        this.viewRecordDetailsTable.total = res.total
       })
     },
     getTaskList() {
@@ -1169,30 +1217,39 @@ export default {
       getExecutionRecord(params).then((res) => {
         this.drawerRecord = true
         this.recordData = res.records
+        this.table.page = res.page
+        this.table.pageSize = res.pageSize
+        this.table.total = res.total
       })
     },
     viewRecordDetails(item, page) {
       this.drawerRecordStatus = page
       this.currentRecordData = item
-      console.log(item);
+      // console.log(item);
       let params = {
-        page: 1,
+        page: this.viewRecordDetailsTable.page,
         pageSize: 10,
         queryValue: item.executeId
       }
       getInteractionRecord(params).then(res => {
         this.ongoingData = res.records
         this.ongoingDataTotal = res.total
+        this.viewRecordDetailsTable.page = res.page
+        this.viewRecordDetailsTable.pageSize = res.pageSize
+        this.viewRecordDetailsTable.total = res.total
       })
     },
     refresh() {
       let params = {
-        page: 1,
+        page: this.viewRecordDetailsTable.page,
         pageSize: 10,
         queryValue: this.currentRecordData.executeId
       }
       getInteractionRecord(params).then(res => {
         this.ongoingData = res.records
+        this.viewRecordDetailsTable.page = res.page
+        this.viewRecordDetailsTable.pageSize = res.pageSize
+        this.viewRecordDetailsTable.total = res.total
       })
     },
     getParameterSearch(taskCode) {