Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy

# Conflicts:
#	yarn.lock

src/components/Pagination/index.vue

@@ -3,7 +3,7 @@
     <el-pagination
       background
       layout="total, sizes, prev, pager, next, jumper"
-      :page-sizes="[10, 20, 30, 50]"
+      :page-sizes="pagination.pageSizes"
       :current-page="pagination.pageNumber"
       :page-size="pagination.pageSize"
       :total="pagination.total"
@@ -25,6 +25,7 @@ export default {
         pageNumber: 1,
         pageSize: 10,
         total: 0,
+        pageSizes:[10, 20, 30, 50]
       },
     },
   },

src/views/plan/workbench/homePage/beta/predict/index.vue

@@ -82,6 +82,7 @@ export default {
 				pageNumber: 1,
 				pageSize: 10,
 				total: 0,
+        pageSizes:[10,50,100,200]
 			},
 			batchImport: [],
 			// isRefreshList: false,

yarn.lock

@@ -2752,11 +2752,6 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@*:
-  version "8.3.0"
-  resolved "https://registry.npmmirror.com/commander/download/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
 commander@2.17.x:
   version "2.17.1"
   resolved "https://registry.nlark.com/commander/download/commander-2.17.1.tgz"
@@ -5927,13 +5922,6 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.5"
 
-mockjs@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmmirror.com/mockjs/download/mockjs-1.1.0.tgz#e6a0c378e91906dbaff20911cc0273b3c7d75b06"
-  integrity sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==
-  dependencies:
-    commander "*"
-
 moment@^2.29.1:
   version "2.29.1"
   resolved "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"