diff --git a/src/views/gameSummary/GameSummary.vue b/src/views/gameSummary/GameSummary.vue index 8b412aa..6e74115 100644 --- a/src/views/gameSummary/GameSummary.vue +++ b/src/views/gameSummary/GameSummary.vue @@ -85,6 +85,9 @@ + @@ -132,6 +135,11 @@ export default { loadingOuter: false, loadingInner: false }); + const dialogPagination = ref({ + pageNo: 1, + pageSize: 10, + total: 0, + }) const detailsDialog = ref(false); const exportStatDate = ref(''); const changeEvent = () => { @@ -219,7 +227,7 @@ export default { try { console.log(exportStatDate.value, '-----') const { channel, gameId, partitionId } = formData.value; - + // Object.assign(dialogPagination.value, { pageSize: 10000, pageNo: 1 }); const res = await exportUserForMiniGame({ channel, gameId, @@ -241,7 +249,7 @@ export default { document.body.appendChild(alink); alink.click(); URL.revokeObjectURL(alink.href); - exportStatDate.value = '' + // exportStatDate.value = '' } } catch (error) { @@ -254,20 +262,25 @@ export default { // 明细 const detailPageFun = async (row) => { tableData.value.loadingInner = true; + if(row){ exportStatDate.value = row.statDate + } const { channel, gameId, partitionId } = formData.value; + const { pageNo,pageSize} = dialogPagination.value const res = await getUserGamedata({ channel, gameId, partitionId, - endTime: row.statDate, - startTime: row.statDate, + endTime: exportStatDate.value, + startTime: exportStatDate.value, + pageNo, + pageSize }) if (res.code == 200) { tableData.value.dataInner = res.data.rows; tableData.value.loadingInner = false; detailsDialog.value = true - + dialogPagination.value.total = res.data.total } } const handleSizeChange = (val) => { @@ -283,6 +296,14 @@ export default { const item = partitionOptions.value.find(item => item.id === partitionId); return item?.desc || '空'; } + const detailhandleSizeChange = (val) => { + dialogPagination.value.pageSize = val; + detailPageFun(); + }; + const detailhandleCurrentChange = (val) => { + dialogPagination.value.pageNo = val; + detailPageFun(); + }; onMounted(() => { listPartitionInfo().then(res => { partitionOptions.value = res.data; @@ -307,7 +328,10 @@ export default { detailsDialog, getPartitionDesc, confirmExport2ExcelTwo, - exportStatDate + exportStatDate, + dialogPagination, + detailhandleSizeChange, + detailhandleCurrentChange }; }, } diff --git a/src/views/users/MessageAdminView.vue b/src/views/users/MessageAdminView.vue index 0756564..3e08bc5 100644 --- a/src/views/users/MessageAdminView.vue +++ b/src/views/users/MessageAdminView.vue @@ -166,12 +166,13 @@ 文本: - - + + rows="16" + >