diff --git a/src/views/modules/job/schedule-log.vue b/src/views/modules/job/schedule-log.vue index 08b20d8..8d406e2 100644 --- a/src/views/modules/job/schedule-log.vue +++ b/src/views/modules/job/schedule-log.vue @@ -1,9 +1,5 @@ - + @@ -20,11 +16,23 @@ 成功 - 失败 + 失败 - + - + layout="total, sizes, prev, pager, next, jumper" + > diff --git a/src/views/modules/job/schedule.vue b/src/views/modules/job/schedule.vue index f6e25c6..41ec1f5 100644 --- a/src/views/modules/job/schedule.vue +++ b/src/views/modules/job/schedule.vue @@ -121,7 +121,7 @@ export default { }, dataList: [], pageIndex: 1, - pageSize: 10, + pageSize: 20, totalPage: 0, dataListLoading: false, dataListSelections: [], diff --git a/src/views/modules/oss/oss.vue b/src/views/modules/oss/oss.vue index cfcd721..0ee878d 100644 --- a/src/views/modules/oss/oss.vue +++ b/src/views/modules/oss/oss.vue @@ -61,7 +61,7 @@ export default { dataForm: {}, dataList: [], pageIndex: 1, - pageSize: 10, + pageSize: 20, totalPage: 0, dataListLoading: false, dataListSelections: [], diff --git a/src/views/modules/staff/archives/index.vue b/src/views/modules/staff/archives/index.vue index d5e7fbe..bef81d0 100644 --- a/src/views/modules/staff/archives/index.vue +++ b/src/views/modules/staff/archives/index.vue @@ -35,8 +35,8 @@ - 查询 - 重置 + 查询 + 重置 @@ -77,6 +77,7 @@ @current-change="handleCurrentChange" :current-page.sync="query.currentPage" :page-sizes="[10, 20, 50]" + :page-size="query.limit" layout="total, sizes, prev, pager, next" :total="query.pageTotal" > @@ -146,7 +147,7 @@ export default { loading: false, query: { page: 1, - limit: 10, + limit: 20, pageTotal: 0, departmentId: null } @@ -179,25 +180,21 @@ export default { } else { this.$message.error(result.msg) } - console.log('result: ', result) }, handleNodeClick (data) { // highlight - current this.query.departmentId = data.departmentId this.handleGetTableList() - console.log('data', data) }, // 获取侧边架构列表 async handleGetMenuList () { const result = await apiOrganizationList() - console.log('result: ', result) this.menuList = result }, // 获取数据列表 { page: 0, limit: 5 } async handleGetTableList (id) { - this.loading = true - let result = await apiEmployeesList(Object.assign({}, this.query, { limit: this.query.pageSize })) - console.log('result: ', result) + let result = await apiEmployeesList(Object.assign({}, this.query, { limit: this.query.limit })) + if (result.code === 0) { this.tableData = result.page.list this.query.pageTotal = result.page.totalCount @@ -216,17 +213,18 @@ export default { this.$refs.treeList.setCurrentKey() this.handleGetTableList() }, - getTable () { + async handleGetTable () { this.query.page = 1 - this.handleGetTableList() + this.loading = true + await this.handleGetTableList() + this.loading = false }, handleCurrentChange (val) { - console.log('val: ', val) this.query.page = val this.handleGetTableList() }, handleSizeChange (val) { - this.query.pageSize = val + this.query.limit = val this.handleGetTableList() }, // 弹窗相关 @@ -234,7 +232,6 @@ export default { console.log(tab, event) }, async handleView (data) { - console.log('data: ', data) await this.getEmployeesInfo(data.staffId) } } diff --git a/src/views/modules/staff/profile/index.vue b/src/views/modules/staff/profile/index.vue index 5a165e2..44e7355 100644 --- a/src/views/modules/staff/profile/index.vue +++ b/src/views/modules/staff/profile/index.vue @@ -1,26 +1,28 @@ - - - - - - - - - + + + - - + + - - - - - - - + + + + + + + + + + + + + + + @@ -59,7 +61,14 @@ export default { }, // 获取页面数据 async initData () { - this.handleGetEmployeessItuation() + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + await this.handleGetEmployeessItuation() + loading.close() }, submit (data) { this.handleGetEmployeessItuation(data) diff --git a/src/views/modules/sys/config/index.vue b/src/views/modules/sys/config/index.vue index cce0d42..cae894a 100644 --- a/src/views/modules/sys/config/index.vue +++ b/src/views/modules/sys/config/index.vue @@ -63,7 +63,7 @@ export default { }, dataList: [], pageIndex: 1, - pageSize: 10, + pageSize: 20, totalPage: 0, dataListLoading: false, dataListSelections: [], diff --git a/src/views/modules/sys/log.vue b/src/views/modules/sys/log.vue index bc53257..f9dd9cb 100644 --- a/src/views/modules/sys/log.vue +++ b/src/views/modules/sys/log.vue @@ -61,7 +61,7 @@ export default { }, dataList: [], pageIndex: 1, - pageSize: 10, + pageSize: 20, totalPage: 0, dataListLoading: false, selectionDataList: [] diff --git a/src/views/modules/sys/role/index.vue b/src/views/modules/sys/role/index.vue index c71efb9..2013118 100644 --- a/src/views/modules/sys/role/index.vue +++ b/src/views/modules/sys/role/index.vue @@ -86,7 +86,7 @@ export default { }, dataList: [], pageIndex: 1, - pageSize: 10, + pageSize: 20, totalPage: 0, dataListLoading: false, dataListSelections: [], diff --git a/src/views/modules/sys/user/index.vue b/src/views/modules/sys/user/index.vue index e33d88d..e4c44ff 100644 --- a/src/views/modules/sys/user/index.vue +++ b/src/views/modules/sys/user/index.vue @@ -87,7 +87,7 @@ export default { }, dataList: [], pageIndex: 1, - pageSize: 10, + pageSize: 20, totalPage: 0, dataListLoading: false, dataListSelections: [],