Merge branch 'master' of http://159.75.201.17:3000/zwq/tuanfeng-pc-admin

src/views/setup/businessMenus/index.vue

@@ -157,6 +157,7 @@ export default {
       currentPage: 1,
       userState: 1,
       addForm: {
+        project: 0,
         permissionPid: '', // 父节点id
         permissionName: '', // 权限名称
         permissionUri: '', // URI
@@ -308,6 +309,7 @@ export default {
             return
           }
           this.addForm = {
+            project: 0,
             permissionPid: '', // 父节点id
             permissionName: '', // 权限名称
             permissionUri: '', // URI
@@ -332,6 +334,7 @@ export default {
             return
           }
           this.addForm = {
+            project: 0,
             permissionPid: this.multipleSelection[0].permissionId, // 父节点id
             permissionName: '', // 权限名称
             permissionUri: '', // URI
@@ -359,6 +362,7 @@ export default {
             return
           }
           this.addForm = {
+            project: 0,
             permissionPid: this.multipleSelection[0].permissionId, // 父节点id
             permissionName: '', // 权限名称
             permissionUri: '', // URI

src/views/setup/timedTasksList/index.vue

@@ -65,7 +65,7 @@
 
     <div>
       <el-pagination
-        :current-page="listQuery.current" :page-sizes="[10, 20, 50, 100]" :page-size="10"
+        :current-page="listQuery.current" :page-sizes="[10, 20, 50, 100]" :page-size="listQuery.size"
         layout="total, sizes, prev, pager, next, jumper" :total="total"
         @size-change="(val) => ((listQuery.size = val) && getList())"
         @current-change="(val) => ((listQuery.current = val) && getList())"