:alien: Updating code due to external API changes.

src/const/crud/activiti.js

@@ -25,6 +25,7 @@ export const tableOption = {
     align: 'center',
     editBtn: false,
     delBtn: false,
+    menuType:'menu',
     searchShow: false,
     labelWidth: 120,
     column: [{
@@ -74,4 +75,4 @@ export const tableOption = {
         editVisdiplay: false,
         hide: true
     }]
-}
+}

src/const/crud/leavebill.js

@@ -25,6 +25,7 @@ export const tableOption = {
   'editBtn': false,
   'delBtn': false,
   'addBtn': false,
+   menuType:'menu',
   'dicUrl': '/admin/dict/type/leave_status',
   'column': [
 	  {

src/const/crud/process.js

@@ -26,6 +26,7 @@ export const tableOption = {
     addBtn: false,
     editBtn: false,
     delBtn: false,
+    menuType:'menu',
     searchShow: false,
     column: [{
         fixed: true,
@@ -57,4 +58,4 @@ export const tableOption = {
         editDisabled: true,
         addVisdiplay: false
     }]
-}
+}

src/const/crud/task.js

@@ -24,6 +24,7 @@ export const tableOption = {
     'editBtn': false,
     'delBtn': false,
     'addBtn': false,
+    menuType: 'menu',
     'dic': [],
     'column': [
         {

src/page/login/index.vue

@@ -3,11 +3,9 @@
        @keyup.enter.native="handleLogin">
     <div class="login-logo animated fadeIn">
       <el-select v-model="active"
+                 @change="handleCommand"
                  placeholder="请选择租户，不选为默认"
                  size="mini">
-        <el-option label="默认租户"
-                   value="">
-        </el-option>
         <el-option label="租户1"
                    value="1">
         </el-option>
@@ -58,7 +56,7 @@ import codeLogin from "./codelogin";
 import thirdLogin from "./thirdlogin";
 import topColor from "../index/top/top-color";
 import color from "@/mixins/color";
-import { setStore } from '@/util/store'
+import { setStore,getStore } from '@/util/store'
 import { mapGetters } from "vuex";
 import { validatenull } from '@/util/validate'
 export default {
@@ -95,6 +93,7 @@ export default {
     }
   },
   created () {
+     this.active = getStore({ name: 'tenantId' });
   },
   mounted () { },
   computed: {
@@ -103,7 +102,7 @@ export default {
   props: [],
   methods: {
     handleCommand (command) {
-      setStore({ name: 'tenantId', content: command, type: 'session' })
+      setStore({ name: 'tenantId', content: command})
     }
   }
 };

src/router/axios.js

@@ -48,6 +48,14 @@ axios.interceptors.response.use(res => {
     NProgress.done();
     const status = Number(res.status);
     const message = res.data.message || errorCode[status] || errorCode['default'];
+
+    if (status === 401){
+        store.dispatch('FedLogOut').then(() => {
+            router.push({
+                path: '/login'
+            });
+        })
+    }
     if (status !== 200) {
         Message({
             message: message,
@@ -61,4 +69,4 @@ axios.interceptors.response.use(res => {
     return Promise.reject(new Error(error))
 })
 
-export default axios
+export default axios

src/views/admin/activiti/index.vue

@@ -23,22 +23,21 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
-                 @current-change="currentChange"
-                 @size-change="sizeChange"
+                 @on-load="getList"
                  @search-change="searchChange"
                  @refresh-change="refreshChange"
                  @row-save="handleSave"
                  @row-del="rowDel">
         <template slot-scope="scope"
-                  slot="dropMenu">
+                  slot="menuBtn">
           <el-dropdown-item divided
-                            v-if="permissions.sys_log_del"
+                            v-if="permissions.act_model_manage"
                             @click.native="handleView(scope.row,scope.index)">模型图</el-dropdown-item>
           <el-dropdown-item divided
-                            v-if="permissions.sys_log_del"
+                            v-if="permissions.act_model_manage"
                             @click.native="handleDeploy(scope.row,scope.index)">部署</el-dropdown-item>
           <el-dropdown-item divided
-                            v-if="permissions.sys_log_del"
+                            v-if="permissions.act_model_manage"
                             @click.native="handleDel(scope.row,scope.index)">删除</el-dropdown-item>
 
         </template>
@@ -61,41 +60,30 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 20 // 每页显示多少条
       },
-      listQuery: {
-        page: 1,
-        limit: 20,
-        category: undefined
-      },
       tableLoading: false,
       tableOption: tableOption
     }
   },
   created () {
-    this.getList()
   },
   mounted: function () { },
   computed: {
     ...mapGetters(['permissions'])
   },
   methods: {
-    getList () {
+    getList (page,params) {
       this.tableLoading = true
-      this.listQuery.orderByField = 'create_time'
-      this.listQuery.isAsc = false
-      fetchList(this.listQuery).then(response => {
+      fetchList(Object.assign({
+          orderByField: 'create_time',
+          isAsc: false,
+          page: page.currentPage,
+          limit: page.pageSize
+      }, params)).then(response => {
         this.tableData = response.data.records
         this.page.total = response.data.total
         this.tableLoading = false
       })
     },
-    currentChange (val) {
-      this.listQuery.page = val
-      this.getList()
-    },
-    sizeChange (val) {
-      this.listQuery.limit = val
-      this.getList()
-    },
     handleView (row, index) {
       const name = `模型id为${row.id}的${row.name}流程图`,
         src = `/activti/detail/${row.id}`;
@@ -119,7 +107,7 @@ export default {
         return deploy(row.id)
       })
         .then(data => {
-          this.getList()
+          this.getList(this.page)
           _this.$message({
             showClose: true,
             message: '部署成功',
@@ -139,7 +127,7 @@ export default {
           return delObj(row.id)
         })
         .then(data => {
-          this.getList()
+          this.getList(this.page)
           _this.$message({
             showClose: true,
             message: '删除成功',
@@ -163,21 +151,20 @@ export default {
           type: 'success'
         })
         done()
-        this.getList()
+        this.getList(this.page)
       })
     },
     /**
      * 搜索回调
      */
     searchChange (form) {
-      this.listQuery.category = form.category
-      this.getList()
+      this.getList(this.page,form)
     },
     /**
      * 刷新回调
      */
     refreshChange () {
-      this.getList()
+      this.getList(this.page)
     }
   }
 }

src/views/admin/activiti/leave.vue

@@ -23,10 +23,9 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
+                 @on-load="getList"
                  @search-change="searchChange"
-                 @current-change="currentChange"
                  @refresh-change="refreshChange"
-                 @size-change="sizeChange"
                  @row-update="handleUpdate"
                  @row-save="handleSave"
                  @row-del="rowDel">
@@ -37,7 +36,7 @@
                      v-if="permissions.act_leavebill_add">新 增</el-button>
         </template>
         <template slot-scope="scope"
-                  slot="dropMenu">
+                  slot="menuBtn">
           <el-dropdown-item divided
                             v-if="permissions.act_leavebill_edit && scope.row.state == 0"
                             @click.native="handleSubmit(scope.row,scope.index)">提交</el-dropdown-item>
@@ -68,42 +67,30 @@
           currentPage: 1, // 当前页数
           pageSize: 20 // 每页显示多少条
         },
-        listQuery: {
-          page: 1,
-          limit: 20
-        },
         tableLoading: false,
         tableOption: tableOption
       }
     },
     created() {
-      this.getList()
     },
     mounted: function() { },
     computed: {
       ...mapGetters(['permissions'])
   },
   methods: {
-    getList() {
-      this.listQuery.orderByField = 'create_time'
-      this.listQuery.isAsc = false
+    getList(page,params) {
       this.tableLoading = true
-      fetchList(this.listQuery).then(response => {
+      fetchList(Object.assign({
+          orderByField: 'create_time',
+          isAsc: false,
+          page: page.currentPage,
+          limit: page.pageSize
+      }, params)).then(response => {
         this.tableData = response.data.records
         this.page.total = response.data.total
         this.tableLoading = false
     })
     },
-    currentChange(val) {
-      this.page.currentPage = val
-      this.listQuery.page = val
-      this.getList()
-    },
-    sizeChange(val) {
-      this.page.pageSize = val
-      this.listQuery.limit = val
-      this.getList()
-    },
     /**
      * @title 打开新增窗口
      * @detail 调用crud的handleadd方法即可
@@ -153,7 +140,7 @@
                       message: '提交成功',
                       type: 'success'
                   })
-                this.getList()
+                this.getList(this.page)
             }).catch(function(err) { })
       },
     /**
@@ -172,7 +159,7 @@
         type: 'success'
       })
       done()
-      this.getList()
+      this.getList(this.page)
     })
     },
     /**
@@ -190,21 +177,21 @@
         type: 'success'
       })
       done()
-      this.getList()
+      this.getList(this.page)
     })
     },
     /**
      * 搜索回调
      */
     searchChange(form) {
-        this.listQuery.state = form.state
-        this.getList()
+        this.page.state = form.state
+        this.getList(this.page,form)
     },
     /**
      * 刷新回调
      */
     refreshChange() {
-      this.getList()
+      this.getList(this.page)
     }
   }
   }

src/views/admin/activiti/process.vue

@@ -23,27 +23,26 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
-                 @current-change="currentChange"
-                 @size-change="sizeChange"
+                 @on-load="getList"
                  @search-change="searchChange"
                  @refresh-change="refreshChange"
                  @row-del="rowDel">
         <template slot-scope="scope"
-                  slot="dropMenu">
+                  slot="menuBtn">
 
           <el-dropdown-item divided
-                            v-if="permissions.sys_log_del"
+                            v-if="permissions.act_process_manage"
                             @click.native="handlePic(scope.row,scope.index)">流程图</el-dropdown-item>
           <el-dropdown-item divided
-                            v-if="permissions.sys_log_del && scope.row.suspend"
+                            v-if="permissions.act_process_manage && scope.row.suspend"
                             @click.native="handleStatus(scope.row,'active')">激活</el-dropdown-item>
 
           <el-dropdown-item divided
-                            v-if="permissions.sys_log_del && !scope.row.suspend"
+                            v-if="permissions.act_process_manage && !scope.row.suspend"
                             @click.native="handleStatus(scope.row,'suspend')">失效</el-dropdown-item>
 
           <el-dropdown-item divided
-                            v-if="permissions.sys_log_del"
+                            v-if="permissions.act_process_manage"
                             @click.native="handleDel(scope.row,'suspend')">删除</el-dropdown-item>
         </template>
       </avue-crud>
@@ -71,41 +70,30 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 20 // 每页显示多少条
       },
-      listQuery: {
-        page: 1,
-        limit: 20,
-        category: undefined
-      },
       tableLoading: false,
       tableOption: tableOption
     }
   },
   created () {
-    this.getList()
   },
   mounted: function () { },
   computed: {
     ...mapGetters(['permissions'])
   },
   methods: {
-    getList () {
+    getList (page,params) {
       this.tableLoading = true
-      this.listQuery.orderByField = 'create_time'
-      this.listQuery.isAsc = false
-      fetchList(this.listQuery).then(response => {
+      fetchList(Object.assign({
+          orderByField: 'create_time',
+          isAsc: false,
+          page: page.currentPage,
+          limit: page.pageSize
+      }, params)).then(response => {
         this.tableData = response.data.records
         this.page.total = response.data.total
         this.tableLoading = false
       })
     },
-    currentChange (val) {
-      this.listQuery.page = val
-      this.getList()
-    },
-    sizeChange (val) {
-      this.listQuery.limit = val
-      this.getList()
-    },
     handlePic (row, index) {
       this.actPicUrl = `/act/process/resource/` + row.deploymentId + '/' + row.processonDefinitionId + "/image"
       this.showPicDialog = true
@@ -119,7 +107,7 @@ export default {
       }).then(function () {
         return status(row.processonDefinitionId, type)
       }).then(data => {
-        this.getList()
+        this.getList(this.page)
         _this.$message({
           showClose: true,
           message: '操作成功',
@@ -141,7 +129,7 @@ export default {
           return delObj(row.deploymentId)
         })
         .then(data => {
-          this.getList()
+          this.getList(this.page)
           _this.$message({
             showClose: true,
             message: '删除成功',
@@ -154,14 +142,13 @@ export default {
      * 搜索回调
      */
     searchChange (form) {
-      this.listQuery.category = form.category
-      this.getList()
+      this.getList(this.page,form)
     },
     /**
      * 刷新回调
      */
     refreshChange () {
-      this.getList()
+      this.getList(this.page)
     }
   }
 }

src/views/admin/activiti/task.vue

@@ -21,21 +21,20 @@
       <avue-crud ref="crud"
                  :page="page"
                  :data="tableData"
+                 @on-load="getList"
                  :table-loading="tableLoading"
                  :option="tableOption"
-                 @current-change="currentChange"
-                 @refresh-change="refreshChange"
-                 @size-change="sizeChange">
+                 @refresh-change="refreshChange">
         <template slot-scope="scope"
-                  slot="dropMenu">
+                  slot="menuBtn">
           <el-dropdown-item divided
-                            v-if="permissions.act_leavebill_edit"
+                            v-if="permissions.act_task_manage"
                             @click.native="audit(scope.row,scope.index)">审批</el-dropdown-item>
           <el-dropdown-item divided
-                            v-if="permissions.act_leavebill_edit"
+                            v-if="permissions.act_task_manage"
                             @click.native="comment(scope.row,scope.index)">批注</el-dropdown-item>
           <el-dropdown-item divided
-                            v-if="permissions.act_leavebill_edit"
+                            v-if="permissions.act_task_manage"
                             @click.native="viewPic(scope.row,scope.index)">流程图</el-dropdown-item>
         </template>
       </avue-crud>
@@ -83,10 +82,6 @@
           currentPage: 1, // 当前页数
           pageSize: 20 // 每页显示多少条
         },
-        listQuery: {
-          page: 1,
-          limit: 20
-        },
         tableLoading: false,
         tableOption: tableOption,
         formOption: formOption,
@@ -94,30 +89,23 @@
       }
     },
     created() {
-      this.getList()
     },
     mounted: function() { },
     computed: {
       ...mapGetters(['permissions'])
   },
   methods: {
-    getList() {
+    getList(page,params) {
       this.tableLoading = true
-      fetchList(this.listQuery).then(response => {
+      fetchList(Object.assign({
+          page: page.currentPage,
+          limit: page.pageSize
+      }, params)).then(response => {
         this.tableData = response.data.records
         this.page.total = response.data.total
         this.tableLoading = false
     })},
-    currentChange(val) {
-      this.page.currentPage = val
-      this.listQuery.page = val
-      this.getList()
-    },
-    sizeChange(val) {
-      this.page.pageSize = val
-      this.listQuery.limit = val
-      this.getList()
-    },
+
     audit:function(row, index) {
         fetchDetail(row.taskId).then(response => {
           this.obj = response.data.data
@@ -161,7 +149,7 @@
                 type: 'success'
             })
             this.showTask = false
-            this.getList()
+            this.getList(this.page)
         })
     },
     viewPic: function(row, index) {
@@ -172,7 +160,7 @@
      * 刷新回调
      */
     refreshChange() {
-      this.getList()
+      this.getList(this.page)
     }
   }
   }

src/views/admin/client/index.vue

@@ -23,9 +23,8 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
-                 @current-change="currentChange"
+                 @on-load="getList"
                  @refresh-change="refreshChange"
-                 @size-change="sizeChange"
                  @row-update="handleUpdate"
                  @row-save="handleSave"
                  @row-del="rowDel">
@@ -68,32 +67,23 @@ export default {
     }
   },
   created() {
-    this.getList()
   },
   mounted: function() { },
   computed: {
     ...mapGetters(['permissions'])
   },
   methods: {
-    getList() {
+    getList(page,params) {
       this.tableLoading = true
-      fetchList({
-        page: this.page.currentPage,
-        limit: this.page.pageSize
-      }).then(response => {
+      fetchList(Object.assign({
+          page: page.currentPage,
+          limit: page.pageSize
+      }, params)).then(response => {
         this.tableData = response.data.records
         this.page.total = response.data.total
         this.tableLoading = false
       })
     },
-    currentChange(val) {
-      this.page.currentPage = val
-      this.getList()
-    },
-    sizeChange(val) {
-      this.page.pageSize = val
-      this.getList()
-    },
     /**
      * @title 打开新增窗口
      * @detail 调用crud的handleadd方法即可
@@ -167,7 +157,7 @@ export default {
      * 刷新回调
      */
     refreshChange() {
-      this.getList()
+      this.getList(this.page)
     }
   }
 }

src/views/admin/dict/index.vue

@@ -23,8 +23,7 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
-                 @current-change="currentChange"
-                 @size-change="sizeChange"
+                 @on-load="getList"
                  @row-update="handleUpdate"
                  @row-save="handleSave"
                  @search-change="searchChange"
@@ -63,41 +62,28 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 20 // 每页显示多少条
       },
-      listQuery: {
-        page: 1,
-        limit: 20,
-        type: undefined
-      },
       tableLoading: false,
       tableOption: tableOption
     }
   },
   created () {
-    this.getList()
   },
   mounted: function () { },
   computed: {
     ...mapGetters(['permissions'])
   },
   methods: {
-    getList () {
+    getList (page,params) {
       this.tableLoading = true
-      this.listQuery.orderByField = 'create_time'
-      this.listQuery.isAsc = false
-      fetchList(this.listQuery).then(response => {
+      fetchList(Object.assign({
+          page: page.currentPage,
+          limit: page.pageSize
+      }, params)).then(response => {
         this.tableData = response.data.records
         this.page.total = response.data.total
         this.tableLoading = false
       })
     },
-    currentChange (val) {
-      this.listQuery.page = val
-      this.getList()
-    },
-    sizeChange (val) {
-      this.listQuery.limit = val
-      this.getList()
-    },
     /**
      * @title 打开新增窗口
      * @detail 调用crud的handleadd方法即可
@@ -123,7 +109,7 @@ export default {
           return delObj(row)
         })
         .then(() => {
-          this.getList()
+          this.getList(this.page)
           _this.$message({
             showClose: true,
             message: '删除成功',
@@ -168,8 +154,7 @@ export default {
       })
     },
     searchChange (form) {
-      this.listQuery.type = form.type
-      this.getList()
+        this.getList(this.page,form)
     }
   }
 }

src/views/admin/gen/index.vue

@@ -23,9 +23,8 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
-                 @current-change="currentChange"
+                 @on-load="getList"
                  @refresh-change="refreshChange"
-                 @size-change="sizeChange"
                  @search-change="searchChange">
         <template slot-scope="scope"
                   slot="menu">
@@ -70,42 +69,29 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 20 // 每页显示多少条
       },
-      listQuery: {
-        page: 1,
-        limit: 20,
-        tableName: undefined
-      },
       tableLoading: false,
       tableOption: tableOption,
       formOption: formOption
     }
   },
   created () {
-    this.getList()
   },
   mounted: function () { },
   computed: {
     ...mapGetters(['permissions'])
   },
   methods: {
-    getList () {
+    getList (page,params) {
       this.tableLoading = true
-      fetchList(this.listQuery).then(response => {
+      fetchList(Object.assign({
+          page: page.currentPage,
+          limit: page.pageSize
+      }, params)).then(response => {
         this.tableData = response.data.records
         this.page.total = response.data.total
         this.tableLoading = false
       })
     },
-    currentChange (val) {
-      this.page.currentPage = val
-      this.listQuery.page = val
-      this.getList()
-    },
-    sizeChange (val) {
-      this.page.pageSize = val
-      this.listQuery.limit = val
-      this.getList()
-    },
     handleDown: function (row, index) {
       this.formData.tableName = row.tableName
       this.box = true
@@ -114,11 +100,10 @@ export default {
      * 刷新回调
      */
     refreshChange () {
-      this.getList()
+      this.getList(this.form)
     },
     searchChange (form) {
-      this.listQuery.tableName = form.tableName
-      this.getList()
+      this.getList(this.page,form)
     },
     gen (form) {
       handleDown(this.formData).then(response => {

src/views/admin/log/index.vue

@@ -23,8 +23,7 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
-                 @current-change="currentChange"
-                 @size-change="sizeChange"
+                 @on-load="getList"
                  @search-change="searchChange"
                  @refresh-change="refreshChange"
                  @row-del="rowDel">
@@ -56,41 +55,30 @@
           currentPage: 1, // 当前页数
           pageSize: 20 // 每页显示多少条
         },
-        listQuery: {
-          page: 1,
-          limit: 20,
-          type: undefined
-        },
         tableLoading: false,
         tableOption: tableOption
       }
     },
     created() {
-      this.getList()
     },
     mounted: function() { },
     computed: {
       ...mapGetters(['permissions'])
     },
     methods: {
-      getList() {
+      getList(page,params) {
         this.tableLoading = true
-        this.listQuery.orderByField = 'create_time'
-        this.listQuery.isAsc = false
-        fetchList(this.listQuery).then(response => {
+        fetchList(Object.assign({
+            orderByField: 'create_time',
+            isAsc: false,
+            page: page.currentPage,
+            limit: page.pageSize
+        }, params)).then(response => {
           this.tableData = response.data.records
           this.page.total = response.data.total
           this.tableLoading = false
         })
       },
-      currentChange(val) {
-        this.listQuery.page = val
-        this.getList()
-      },
-      sizeChange(val) {
-        this.listQuery.limit = val
-        this.getList()
-      },
       handleDel(row, index) {
         this.$refs.crud.rowDel(row, index)
       },
@@ -105,7 +93,7 @@
             return delObj(row.id)
           })
           .then(data => {
-            this.getList()
+            this.getList(this.page)
             _this.$message({
               showClose: true,
               message: '删除成功',
@@ -118,14 +106,13 @@
        * 搜索回调
        */
       searchChange(form) {
-        this.listQuery.type = form.type
-        this.getList()
+        this.getList(this.page,form)
       },
       /**
        * 刷新回调
        */
       refreshChange() {
-        this.getList()
+        this.getList(this.page)
       }
     }
   }

src/views/admin/role/index.vue

@@ -25,8 +25,7 @@
                  v-model="form"
                  :table-loading="listLoading"
                  :before-open="handleOpenBefore"
-                 @current-change="handleCurrentChange"
-                 @size-change="handleSizeChange"
+                 @on-load="getList"
                  @search-change="handleFilter"
                  @refresh-change="handleRefreshChange"
                  @row-update="update"
@@ -116,10 +115,6 @@ export default {
       menuIds: '',
       list: [],
       listLoading: true,
-      listQuery: {
-        page: 1,
-        limit: 20
-      },
       form: {},
       roleId: undefined,
       roleCode: undefined,
@@ -132,7 +127,6 @@ export default {
     }
   },
   created () {
-    this.getList()
     this.roleManager_btn_add = this.permissions['sys_role_add']
     this.roleManager_btn_edit = this.permissions['sys_role_edit']
     this.roleManager_btn_del = this.permissions['sys_role_del']
@@ -142,29 +136,23 @@ export default {
     ...mapGetters(['elements', 'permissions'])
   },
   methods: {
-    getList () {
+    getList (page,params) {
       this.listLoading = true
-      fetchList(this.listQuery).then(response => {
+      fetchList(Object.assign({
+          page: page.currentPage,
+          limit: page.pageSize
+      }, params)).then(response => {
         this.list = response.data.records
         this.page.total = response.data.total
         this.listLoading = false
       })
     },
     handleRefreshChange () {
-      this.getList()
+      this.getList(this.page)
     },
     handleFilter (param) {
-      this.listQuery = Object.assign(this.listQuery, param)
-      this.listQuery.page = 1;
-      this.getList();
-    },
-    handleSizeChange (val) {
-      this.listQuery.limit = val
-      this.getList()
-    },
-    handleCurrentChange (val) {
-      this.listQuery.page = val
-      this.getList()
+      this.page.page = 1;
+      this.getList(this.page,param);
     },
     handleCreate () {
       this.$refs.crud.rowAdd();
@@ -230,7 +218,7 @@ export default {
     },
     create (row, done, loading) {
       addObj(this.form).then(() => {
-        this.getList()
+        this.getList(this.page)
         done();
         this.$notify({
           title: '成功',
@@ -244,7 +232,7 @@ export default {
     },
     update (row, index, done, loading) {
       putObj(this.form).then(() => {
-        this.getList()
+        this.getList(this.page)
         done();
         this.$notify({
           title: '成功',

src/views/admin/social/index.vue

@@ -23,9 +23,8 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
-                 @current-change="currentChange"
+                 @on-load="getList"
                  @refresh-change="refreshChange"
-                 @size-change="sizeChange"
                  @search-change="searchChange"
                  @row-update="handleUpdate"
                  @row-save="handleSave"
@@ -71,41 +70,28 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 20 // 每页显示多少条
       },
-      listQuery: {
-        page: 1,
-        limit: 20,
-        type: undefined
-      },
       tableLoading: false,
       tableOption: tableOption
     }
   },
   created () {
-    this.getList()
   },
   mounted: function () { },
   computed: {
     ...mapGetters(['permissions'])
   },
   methods: {
-    getList () {
+    getList (page,params) {
       this.tableLoading = true
-      fetchList(this.listQuery).then(response => {
+      fetchList(Object.assign({
+          page: page.currentPage,
+          limit: page.pageSize
+      }, params)).then(response => {
         this.tableData = response.data.records
         this.page.total = response.data.total
         this.tableLoading = false
       })
     },
-    currentChange (val) {
-      this.page.currentPage = val
-      this.listQuery.page = val
-      this.getList()
-    },
-    sizeChange (val) {
-      this.page.pageSize = val
-      this.listQuery.limit = val
-      this.getList()
-    },
     /**
      * @title 打开新增窗口
      * @detail 调用crud的handleadd方法即可
@@ -179,14 +165,13 @@ export default {
      * 刷新回调
      */
     refreshChange () {
-      this.getList()
+      this.getList(this.page)
     },
     /**
      * 搜索回调
      */
     searchChange (form) {
-      this.listQuery.type = form.type
-      this.getList()
+      this.getList(this.page,form)
     }
   }
 }

src/views/admin/token/index.vue

@@ -23,9 +23,8 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
-                 @current-change="currentChange"
+                 @on-load="getList"
                  @refresh-change="refreshChange"
-                 @size-change="sizeChange"
                  @row-del="rowDel">
         <template slot-scope="scope"
                   slot="menu">
@@ -60,32 +59,23 @@ export default {
     }
   },
   created() {
-    this.getList()
   },
   mounted: function() { },
   computed: {
     ...mapGetters(['permissions'])
   },
   methods: {
-    getList() {
+    getList(page,params) {
       this.tableLoading = true
-      fetchList({
-        page: this.page.currentPage,
-        limit: this.page.pageSize
-      }).then(response => {
+      fetchList(Object.assign({
+          page: page.currentPage,
+          limit: page.pageSize
+      }, params)).then(response => {
         this.tableData = response.data.records
         this.page.total = response.data.total
         this.tableLoading = false
       })
     },
-    currentChange(val) {
-      this.page.currentPage = val
-      this.getList()
-    },
-    sizeChange(val) {
-      this.page.pageSize = val
-      this.getList()
-    },
     handleDel(row, index) {
       this.$refs.crud.rowDel(row, index)
     },
@@ -113,7 +103,7 @@ export default {
      * 刷新回调
      */
     refreshChange() {
-      this.getList()
+      this.getList(this.page)
     }
   }
 }

src/views/daemon/statustracelog/index.vue

@@ -23,9 +23,8 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
-                 @current-change="currentChange"
+                 @on-load="getList"
                  @refresh-change="refreshChange"
-                 @size-change="sizeChange"
                  @search-change="searchChange"
                  @row-update="handleUpdate"
                  @row-save="handleSave"
@@ -58,41 +57,27 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 20 // 每页显示多少条
       },
-      listQuery: {
-        page: 1,
-        limit: 20,
-        job_name: undefined,
-        state: undefined
-      },
       tableLoading: false,
       tableOption: tableOption
     }
   },
   created () {
-    this.getList()
   },
   mounted: function () { },
   computed: {
     ...mapGetters(['permissions'])
   },
   methods: {
-    getList () {
-      this.tableLoading = true
-      fetchList(this.listQuery).then(response => {
-        this.tableData = response.data.records
-        this.page.total = response.data.total
-        this.tableLoading = false
-      })
-    },
-    currentChange (val) {
-      this.page.currentPage = val
-      this.listQuery.page = val
-      this.getList()
-    },
-    sizeChange (val) {
-      this.page.pageSize = val
-      this.listQuery.limit = val
-      this.getList()
+    getList (page,params) {
+        this.tableLoading = true
+        fetchList(Object.assign({
+            page: page.currentPage,
+            limit: page.pageSize
+        }, params)).then(response => {
+            this.tableData = response.data.records
+            this.page.total = response.data.total
+            this.tableLoading = false
+        })
     },
     /**
      * @title 打开新增窗口
@@ -164,15 +149,13 @@ export default {
       })
     },
     searchChange (form) {
-      this.listQuery.job_name = form.job_name
-      this.listQuery.state = form.state
-      this.getList()
+      this.getList(this.page,form)
     },
     /**
      * 刷新回调
      */
     refreshChange () {
-      this.getList()
+      this.getList(this.page)
     }
   }
 }