Merge remote-tracking branch 'origin/master'

@@ -172,8 +172,7 @@
                 </el-button>
                 </el-button>
             </el-row>
             </el-row>
         </div>
         </div>
-        <pagination  background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="arriveQuery.pageSize"
-                    :limit.sync="arriveQuery.limitSize"
+        <pagination v-show="total>0" :total="total" :page.sync="arriveQuery.pageSize" :limit.sync="arriveQuery.limitSize"
                     @pagination="getList"/>
                     @pagination="getList"/>
         <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible">
         <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible">
             <el-form ref="arriveFormData" :model="arriveModel" :rules="arriveRoles" label-position="right"
             <el-form ref="arriveFormData" :model="arriveModel" :rules="arriveRoles" label-position="right"

@@ -162,7 +162,7 @@
                     </el-button>
                     </el-button>
                 </el-row>
                 </el-row>
             </div>
             </div>
-            <pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="loadingQuery.pageSize" :limit.sync="loadingQuery.limitSize"
+            <pagination v-show="total>0" :total="total" :page.sync="loadingQuery.pageSize" :limit.sync="loadingQuery.limitSize"
                         @pagination="getList"/>
                         @pagination="getList"/>
 
 
             <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible">
             <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible">

@@ -166,7 +166,7 @@
                 listLoading: false,
                 listLoading: false,
                 listQuery: {
                 listQuery: {
                     pageSize: 1,
                     pageSize: 1,
-                    limitSize: 100,
+                    limitSize: 10,
                     awba:undefined,
                     awba:undefined,
                     carrier: '',
                     carrier: '',
                     flightno:'',
                     flightno:'',

@@ -222,8 +222,7 @@
                 </el-button>
                 </el-button>
             </el-row>
             </el-row>
         </div>
         </div>
-
-        <pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="preQuery.pageSize" :limit.sync="preQuery.limitSize"
+        <pagination v-show="total>0" :total="total" :page.sync="preQuery.pageSize" :limit.sync="preQuery.limitSize"
                     @pagination="getList"/>
                     @pagination="getList"/>
         <el-dialog  top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%">
         <el-dialog  top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%">
             <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right"
             <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right"