diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index d7c2cf47b..1da18b91e 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -72,6 +72,15 @@
+
@@ -99,6 +108,15 @@
+
@@ -166,7 +184,10 @@ export default {
eventTypeCheck: [],
pageNo: 1,
pageSize: window.localStorage.getItem('pageSize') || 20,
- total: 1,
+ pageNo2: 1,
+ pageSize2: window.localStorage.getItem('pageSize2') || 20,
+ total: 0,
+ total2: 0,
endPickerOptions: {
disabledDate: endDisabledDate
},
@@ -178,7 +199,7 @@ export default {
},
computed: {
maxTableHeight() {
- return this.$store.state.inIframe ? this.clientHeight - 400 + this.iframeHeigh : this.clientHeight - 400;
+ return this.$store.state.inIframe ? this.clientHeight - 439 + this.iframeHeigh : this.clientHeight - 439;
},
...mapGetters(['clientHeight', 'iframeHeight'])
@@ -202,6 +223,24 @@ export default {
this.getCountLevel();
},
methods: {
+ handleSizeChange(val) {
+ this.pageSize = val;
+ window.localStorage.setItem('pageSize', val);
+ this.getTableData();
+ },
+ handleCurrentChange(val) {
+ this.pageNo = val;
+ this.getTableData();
+ },
+ handleSizeChange2(val) {
+ this.pageSize2 = val;
+ window.localStorage.setItem('pageSize2', val);
+ this.getTableData2();
+ },
+ handleCurrentChange2(val) {
+ this.pageNo2 = val;
+ this.getTableData2();
+ },
handleChangeAgency(val) {
let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
console.log(obj);
@@ -217,7 +256,7 @@ export default {
this.orgId = this.formData.orgId;
}
console.log(this.formData);
- this.pageNo = 1;
+ this.pageNo = 1;this.pageNo2 = 1;
this.getTableData();
this.getTableData2();
this.getCountLevel();
@@ -314,11 +353,20 @@ export default {
const url = '/gov/org/staffLoginLog/getAccountActivityInfo';
- let param = { orgId: this.orgId, isActivity: 1, startDate: this.formData.startDate, endDate: this.formData.endDate };
+ let param = {
+ orgId: this.orgId,
+ startDate: this.formData.startDate,
+ endDate: this.formData.endDate,
+ isActivity: 1,
+ isPage: true,
+ pageNo: this.pageNo,
+ pageSize: this.pageSize
+ };
const { data, code, msg } = await requestPost(url, param);
this.tableLoading = false;
if (code === 0) {
+ this.total = data.total || 0;
this.tableData = data.list
? data.list.map(item => {
return item;
@@ -333,11 +381,21 @@ export default {
const url = '/gov/org/staffLoginLog/getAccountActivityInfo';
- let param = { orgId: this.orgId, isActivity: 0, startDate: this.formData.startDate, endDate: this.formData.endDate };
+ let param = {
+ orgId: this.orgId,
+ startDate: this.formData.startDate,
+ endDate: this.formData.endDate,
+ isActivity: 0,
+ isPage: true,
+ pageNo: this.pageNo2,
+ pageSize: this.pageSize2
+ };
const { data, code, msg } = await requestPost(url, param);
this.tableLoading2 = false;
if (code === 0) {
+ this.total2 = data.total || 0;
+ console.log(this.total2)
this.tableData2 = data.list
? data.list.map(item => {
return item;