fix:每个分页的条数改为20

src/views/modules/job/schedule-log.vue

@@ -1,9 +1,5 @@
 <template>
-  <el-dialog
+  <el-dialog title="日志列表" :close-on-click-modal="false" :visible.sync="visible" width="75%">
-    title="日志列表"
-    :close-on-click-modal="false"
-    :visible.sync="visible"
-    width="75%">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="handleGetTableList()">
       <el-form-item>
         <el-input v-model="dataForm.id" placeholder="任务ID" clearable></el-input>
@@ -20,11 +16,23 @@
       <el-table-column prop="status" header-align="center" align="center" label="状态">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.status === 0" size="small">成功</el-tag>
-          <el-tag v-else @click.native="handleShowErrorInfo(scope.row.logId)" size="small" type="danger" style="cursor: pointer;">失败</el-tag>
+          <el-tag
+            v-else
+            @click.native="handleShowErrorInfo(scope.row.logId)"
+            size="small"
+            type="danger"
+            style="cursor: pointer;"
+          >失败</el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="times" header-align="center" align="center" label="耗时(单位: 毫秒)"></el-table-column>
-      <el-table-column prop="createTime" header-align="center" align="center" width="180" label="执行时间"></el-table-column>
+      <el-table-column
+        prop="createTime"
+        header-align="center"
+        align="center"
+        width="180"
+        label="执行时间"
+      ></el-table-column>
     </el-table>
     <el-pagination
       @size-change="handleChangeSize"
@@ -33,15 +41,15 @@
       :page-sizes="[10, 20, 50, 100]"
       :page-size="pageSize"
       :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
+      layout="total, sizes, prev, pager, next, jumper"
-    </el-pagination>
+    ></el-pagination>
   </el-dialog>
 </template>
 
 <script>
-  import { apiSysScheduleLogList, apiSysScheduleLogInfo } from '@/api/api_sys'
+import { apiSysScheduleLogList, apiSysScheduleLogInfo } from '@/api/api_sys'
 
-  export default {
+export default {
   data () {
     return {
       visible: false,
@@ -50,7 +58,7 @@
       },
       dataList: [],
       pageIndex: 1,
-        pageSize: 10,
+      pageSize: 20,
       totalPage: 0,
       dataListLoading: false
     }
@@ -99,5 +107,5 @@
       })
     }
   }
-  }
+}
 </script>

src/views/modules/job/schedule.vue

@@ -121,7 +121,7 @@ export default {
       },
       dataList: [],
       pageIndex: 1,
-      pageSize: 10,
+      pageSize: 20,
       totalPage: 0,
       dataListLoading: false,
       dataListSelections: [],

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: [],

src/views/modules/staff/archives/index.vue

@@ -35,8 +35,8 @@
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" :loading="loading" @click="getTable">查询</el-button>
+                <el-button type="primary" :loading="loading" @click="handleGetTable">查询</el-button>
-                <el-button :loading="loading" @click="clear">重置</el-button>
+                <el-button @click="clear">重置</el-button>
               </el-form-item>
             </el-form>
           </div>
@@ -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"
             ></el-pagination>
@@ -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.limit }))
-      let result = await apiEmployeesList(Object.assign({}, this.query, { limit: this.query.pageSize }))
+
-      console.log('result: ', result)
       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)
     }
   }

src/views/modules/staff/profile/index.vue

@@ -1,6 +1,7 @@
 <!--  -->
 <template>
   <div class="staff-archives">
+    <el-main :loding="true">
       <el-card>
         <query-form @submit="submit" />
       </el-card>
@@ -21,6 +22,7 @@
           <chart-form :dataInfo="dataInfo.educationDistribution" title="学历分布" />
         </el-card>
       </div>
+    </el-main>
   </div>
 </template>
 
@@ -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)

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: [],

src/views/modules/sys/log.vue

@@ -61,7 +61,7 @@ export default {
       },
       dataList: [],
       pageIndex: 1,
-      pageSize: 10,
+      pageSize: 20,
       totalPage: 0,
       dataListLoading: false,
       selectionDataList: []

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: [],

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: [],