diff --git a/src/views/EquipmentEntryApply/EquipmentDetailList.vue b/src/views/EquipmentEntryApply/EquipmentDetailList.vue
index 6ede1bb6..934314bc 100644
--- a/src/views/EquipmentEntryApply/EquipmentDetailList.vue
+++ b/src/views/EquipmentEntryApply/EquipmentDetailList.vue
@@ -94,7 +94,7 @@
         </el-row>
         <!-- 表格 -->
         <div class="table-container">
-        <el-table :data="tableData" border stripe :span-method="handleSpanMethod" height="100%">
+        <el-table :data="tableData" border stripe :span-method="handleSpanMethod" height="546">
           <!--      <el-table :data="tableData"  >-->
           <el-table-column label="序号" align="center" width="55" type="index" fixed />
           <el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip column-key="orderNumber"
@@ -195,7 +195,7 @@
 
     <!-- 弹框 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
-      <el-table :data="dialogList" fit highlight-current-row style="width: 100%" :max-height="500">
+      <el-table :data="dialogList" fit highlight-current-row style="width: 100%" height="546">
         <el-table-column type="index" width="55" label="序号" align="center" />
         <el-table-column label="附件名称" prop="fileName" align="center">
           <!-- 插槽 -->
diff --git a/src/views/EquipmentEntryApply/EquipmentMainList.vue b/src/views/EquipmentEntryApply/EquipmentMainList.vue
index cbd3ee83..032ab71c 100644
--- a/src/views/EquipmentEntryApply/EquipmentMainList.vue
+++ b/src/views/EquipmentEntryApply/EquipmentMainList.vue
@@ -50,7 +50,7 @@
 
         <!-- 表格区域 -->
         <div class="table-container">
-          <el-table :data="tableData" border stripe height="100%">
+          <el-table :data="tableData" border stripe height="546">
             <el-table-column label="序号" align="center" width="55" type="index" />
             <el-table-column prop="orderNumber" label="录入单号" align="center" />
             <el-table-column prop="devCount" label="申请录入数量" align="center" />
diff --git a/src/views/EquipmentEntryApply/equipmentInput/index.vue b/src/views/EquipmentEntryApply/equipmentInput/index.vue
index 2fcb5cf6..7775640c 100644
--- a/src/views/EquipmentEntryApply/equipmentInput/index.vue
+++ b/src/views/EquipmentEntryApply/equipmentInput/index.vue
@@ -198,7 +198,7 @@
         :span-method="handleSpanMethod"
         border
         stripe
-        height="100%"
+        height="546"
       >
         <el-table-column label="序号" align="center" width="55" type="index" fixed/>
         <el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip
@@ -326,7 +326,7 @@
     />
     <!-- 弹框 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
-      <el-table :data="dialogList" fit highlight-current-row style="width: 100%" :max-height="500">
+      <el-table :data="dialogList" fit highlight-current-row style="width: 100%" height="546">
         <el-table-column type="index" width="55" label="序号" align="center"/>
         <el-table-column label="附件名称" prop="fileName" align="center">
           <!-- 插槽 -->
diff --git a/src/views/EquipmentEntryApply/equipmentInput/index1.vue b/src/views/EquipmentEntryApply/equipmentInput/index1.vue
index 320133c0..cd1f6d47 100644
--- a/src/views/EquipmentEntryApply/equipmentInput/index1.vue
+++ b/src/views/EquipmentEntryApply/equipmentInput/index1.vue
@@ -63,6 +63,7 @@
         :data="tableData"
         style="width: auto"
         show-overflow-tooltip
+        height="546"
       >
         <el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
         <el-table-column align="center" label="装备名称">
diff --git a/src/views/EquipmentEntryApproval/EquipmentDetailList.vue b/src/views/EquipmentEntryApproval/EquipmentDetailList.vue
index 60860b66..15a98f89 100644
--- a/src/views/EquipmentEntryApproval/EquipmentDetailList.vue
+++ b/src/views/EquipmentEntryApproval/EquipmentDetailList.vue
@@ -155,7 +155,7 @@
           </el-col>
         </el-row>
       <!-- 表格 -->
-      <el-table :data="tableData" :span-method="handleSpanMethod" border stripe height="100%">
+      <el-table :data="tableData" :span-method="handleSpanMethod" border stripe height="546">
         <!--      <el-table :data="tableData"  >-->
         <el-table-column label="序号" align="center" width="55" type="index" fixed/>
         <el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip
@@ -274,7 +274,7 @@
     </el-card>
     <!-- 弹框 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
-      <el-table :data="dialogList" fit highlight-current-row style="width: 100%" :max-height="500">
+      <el-table :data="dialogList" fit highlight-current-row style="width: 100%" height="546">
         <el-table-column type="index" width="55" label="序号" align="center" />
         <el-table-column label="附件名称" prop="fileName" align="center">
           <!-- 插槽 -->
diff --git a/src/views/EquipmentEntryApproval/EquipmentMainList.vue b/src/views/EquipmentEntryApproval/EquipmentMainList.vue
index 53a7f7de..778b8ec6 100644
--- a/src/views/EquipmentEntryApproval/EquipmentMainList.vue
+++ b/src/views/EquipmentEntryApproval/EquipmentMainList.vue
@@ -51,7 +51,7 @@
             <el-button class="primary-lease" size="mini" type="primary" @click="showDetails('1')">展开明细</el-button>
           </el-col>
         </el-row>
-      <el-table :data="tableData" border stripe height="100%">
+      <el-table :data="tableData" border stripe height="546">
         <el-table-column label="序号" align="center" width="55" type="index"/>
         <el-table-column prop="orderNumber" label="录入单号" align="center"/>
         <el-table-column prop="devCount" label="申请录入数量" align="center"/>
diff --git a/src/views/EquipmentEntryApproval/equipmentInput/index.vue b/src/views/EquipmentEntryApproval/equipmentInput/index.vue
index 00fd9aa3..7764720f 100644
--- a/src/views/EquipmentEntryApproval/equipmentInput/index.vue
+++ b/src/views/EquipmentEntryApproval/equipmentInput/index.vue
@@ -154,7 +154,7 @@
       </el-row>
 
       <!-- 表格 -->
-      <el-table :data="tableData" :span-method="handleSpanMethod">
+      <el-table :data="tableData" :span-method="handleSpanMethod" height="546">
         <!--      <el-table :data="tableData"  >-->
         <el-table-column label="序号" align="center" width="55" type="index" fixed/>
         <el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip
@@ -272,7 +272,7 @@
 
     <!-- 弹框 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
-      <el-table :data="dialogList" fit highlight-current-row style="width: 100%" :max-height="500">
+      <el-table :data="dialogList" fit highlight-current-row style="width: 100%" height="546">
         <el-table-column type="index" width="55" label="序号" align="center" />
         <el-table-column label="附件名称" prop="fileName" align="center">
           <!-- 插槽 -->
diff --git a/src/views/EquipmentLedger/components/equ-repair.vue b/src/views/EquipmentLedger/components/equ-repair.vue
index eff5d54c..7db9088e 100644
--- a/src/views/EquipmentLedger/components/equ-repair.vue
+++ b/src/views/EquipmentLedger/components/equ-repair.vue
@@ -15,7 +15,7 @@
       </el-row>
     </el-form>
 
-    <el-table :data="selectedEquipment" border stripe :max-height="500">
+    <el-table :data="selectedEquipment" border stripe height="546">
       <el-table-column label="序号" type="index" align="center" width="55"/>
       <el-table-column prop="name" label="装备名称" align="center"/>
       <el-table-column prop="specificationModel" label="规格型号" align="center"/>
@@ -108,6 +108,7 @@
         @selection-change="handleSelectionAddEquipment"
         ref="equipmentTable"
         :row-key="row => row.devId"
+        height="546"
       >
         <el-table-column label="序号" type="index" align="center" width="55"/>
         <el-table-column width="55" align="center" type="selection"/>
diff --git a/src/views/EquipmentLedger/components/equ-retire.vue b/src/views/EquipmentLedger/components/equ-retire.vue
index c9fdfbc7..6db01b62 100644
--- a/src/views/EquipmentLedger/components/equ-retire.vue
+++ b/src/views/EquipmentLedger/components/equ-retire.vue
@@ -37,7 +37,7 @@
       </el-row>
     </el-form>
 
-    <el-table :data="selectedEquipment" border stripe :max-height="600">
+    <el-table :data="selectedEquipment" border stripe height="546">
       <el-table-column label="序号" type="index" align="center" width="55" />
       <el-table-column prop="name" label="装备名称" align="center" />
       <el-table-column prop="specificationModel" label="规格型号" align="center" />
@@ -87,6 +87,7 @@
         @selection-change="handleSelectionAddEquipment"
         ref="equipmentTable"
         :row-key="row => row.devId"
+        height="546"
       >
         <el-table-column label="序号" type="index" align="center" width="55" />
         <el-table-column width="55" align="center" type="selection" />
diff --git a/src/views/EquipmentLedger/components/equ-store.vue b/src/views/EquipmentLedger/components/equ-store.vue
index dbdb88c4..b83c6b67 100644
--- a/src/views/EquipmentLedger/components/equ-store.vue
+++ b/src/views/EquipmentLedger/components/equ-store.vue
@@ -59,7 +59,7 @@
           <el-button size="mini" type="primary" @click="onHandleSubmit"> 确定退库</el-button>
         </el-col>
       </el-row>
-      <el-table :data="selectedEquipment" border stripe>
+      <el-table :data="selectedEquipment" border stripe height="546">
         <el-table-column label="序号" type="index" align="center" width="55"/>
         <el-table-column prop="name" label="装备名称" align="center"/>
         <el-table-column prop="devCategory" label="装备类目" align="center">
@@ -154,6 +154,7 @@
         @selection-change="handleSelectionAddEquipment"
         ref="equipmentTable"
         :row-key="(row) => row.devId"
+        height="546"
       >
         <el-table-column label="序号" type="index" align="center" width="55"/>
         <el-table-column width="55" align="center" type="selection"/>
diff --git a/src/views/EquipmentLedger/components/euq-out.vue b/src/views/EquipmentLedger/components/euq-out.vue
index 13d85df8..5471729a 100644
--- a/src/views/EquipmentLedger/components/euq-out.vue
+++ b/src/views/EquipmentLedger/components/euq-out.vue
@@ -156,7 +156,7 @@
       </el-row>
     </el-form>
 
-    <el-table :data="selectedEquipment" border stripe :max-height="500">
+    <el-table :data="selectedEquipment" border stripe height="546">
       <el-table-column label="序号" type="index" align="center" width="55"/>
       <el-table-column prop="name" label="装备名称" align="center"/>
       <el-table-column prop="specificationModel" label="规格型号" align="center"/>
@@ -218,6 +218,7 @@
         @selection-change="handleSelectionAddEquipment"
         ref="equipmentTable"
         :row-key="row => row.devId"
+        height="546"
       >  <!-- 关键修复：添加row-key属性 -->
 
         <el-table-column label="序号" type="index" align="center" width="55"/>
diff --git a/src/views/EquipmentLedger/index.vue b/src/views/EquipmentLedger/index.vue
index 8dd18dba..88e7efc6 100644
--- a/src/views/EquipmentLedger/index.vue
+++ b/src/views/EquipmentLedger/index.vue
@@ -335,6 +335,7 @@
             @selection-change="handleSelectionChange"
             v-loading="tableLoading"
             border stripe
+            height="546"
           >
             <el-table-column align="center" show-overflow-tooltip type="selection" width="50"/>
             <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50"/>
@@ -711,7 +712,7 @@
 
     <!-- 弹框 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
-      <el-table :data="dialogList" fit highlight-current-row style="width: 100%"  :max-height="500">
+      <el-table :data="dialogList" fit highlight-current-row style="width: 100%" height="546">
         <el-table-column type="index" width="55" label="序号" align="center"/>
         <el-table-column label="附件名称" prop="fileName" align="center">
           <!-- 插槽 -->
diff --git a/src/views/EquipmentRetire/index.vue b/src/views/EquipmentRetire/index.vue
index b5e12f87..73a2175e 100644
--- a/src/views/EquipmentRetire/index.vue
+++ b/src/views/EquipmentRetire/index.vue
@@ -99,7 +99,7 @@
           </el-col>
         </el-row>-->
         <div class="table-container">
-          <el-table :data="tableData" style="width: 100%" border stripe height="100%">
+          <el-table :data="tableData" style="width: 100%" border stripe height="546">
             <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50"/>
             <el-table-column align="center" show-overflow-tooltip prop="propertyUnit" label="单位名称"/>
             <el-table-column align="center" show-overflow-tooltip prop="name" label="装备名称"/>
diff --git a/src/views/EquipmentRetireApply/audit-detail.vue b/src/views/EquipmentRetireApply/audit-detail.vue
index 18b2b410..13ea6c0c 100644
--- a/src/views/EquipmentRetireApply/audit-detail.vue
+++ b/src/views/EquipmentRetireApply/audit-detail.vue
@@ -60,7 +60,7 @@
 
         </div>
 
-        <el-table ref="detailTable" :data="detailList" style="width: 100%" border stripe size="small" fit @selection-change="onSelectionChange">
+        <el-table ref="detailTable" :data="detailList" height="546" style="width: 100%" border stripe size="small" fit @selection-change="onSelectionChange">
           <el-table-column type="selection" width="50" :selectable="row => !row.reviewStatus || (row.reviewStatus !== '1' && row.reviewStatus !== '2')" />
           <el-table-column align="center" type="index" label="序号" width="80" />
           <el-table-column align="center" prop="type" label="分类" width="100" />
diff --git a/src/views/EquipmentRetireApply/audit.vue b/src/views/EquipmentRetireApply/audit.vue
index 2c60231e..d37d5be9 100644
--- a/src/views/EquipmentRetireApply/audit.vue
+++ b/src/views/EquipmentRetireApply/audit.vue
@@ -48,7 +48,7 @@
           <el-col :span="4">
             <span style="font-size: 20px; font-weight: 800">退役审核列表</span>
           </el-col>
-          <el-table :data="tableData" style="width: 100%" border stripe  fit>
+          <el-table :data="tableData" style="width: 100%" border stripe  fit height="546">
             <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50" />
             <el-table-column align="center" show-overflow-tooltip prop="code" label="退役单号" />
             <el-table-column align="center" show-overflow-tooltip prop="equipmentNum" label="退役装备数" />
diff --git a/src/views/EquipmentRetireApply/components/AddItemDialog.vue b/src/views/EquipmentRetireApply/components/AddItemDialog.vue
index 163545c2..438c0cb5 100644
--- a/src/views/EquipmentRetireApply/components/AddItemDialog.vue
+++ b/src/views/EquipmentRetireApply/components/AddItemDialog.vue
@@ -88,6 +88,7 @@
       stripe
       size="small"
       fit
+      height="546"
       @selection-change="onSelectionChange"
     >
       <el-table-column type="selection" width="50" />
diff --git a/src/views/EquipmentRetireApply/detail.vue b/src/views/EquipmentRetireApply/detail.vue
index ce8a77c8..ab5a8f6a 100644
--- a/src/views/EquipmentRetireApply/detail.vue
+++ b/src/views/EquipmentRetireApply/detail.vue
@@ -53,7 +53,7 @@
           </el-col>
         </div>
 
-        <el-table :data="detailList" style="width: 100%" border stripe size="small" fit>
+        <el-table :data="detailList" style="width: 100%" border stripe size="small" fit height="546">
           <el-table-column align="center" type="index" label="序号" width="70" />
           <el-table-column align="center" prop="type" label="分类" width="90" />
           <el-table-column align="center" prop="typeName" label="类目" width="180" />
diff --git a/src/views/EquipmentRetireApply/index.vue b/src/views/EquipmentRetireApply/index.vue
index ad23b7cb..523f81c1 100644
--- a/src/views/EquipmentRetireApply/index.vue
+++ b/src/views/EquipmentRetireApply/index.vue
@@ -56,7 +56,7 @@
           </el-row>
 
 
-          <el-table :data="tableData" style="width: 100%" border stripe  fit >
+          <el-table :data="tableData" style="width: 100%" border stripe  fit height="546">
             <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50" />
             <el-table-column align="center" show-overflow-tooltip prop="code" label="退役单号" />
             <el-table-column align="center" show-overflow-tooltip prop="equipmentNum" label="退役装备数" />
diff --git a/src/views/EquipmentRetireApply/todo.vue b/src/views/EquipmentRetireApply/todo.vue
index 43569681..8c34176c 100644
--- a/src/views/EquipmentRetireApply/todo.vue
+++ b/src/views/EquipmentRetireApply/todo.vue
@@ -29,7 +29,7 @@
 
       <el-card class="content-box">
         <div class="table-container">
-          <el-table :data="tableData" style="width: 100%" border stripe height="100%" fit>
+          <el-table :data="tableData" style="width: 100%" border stripe height="546" fit>
             <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50" />
             <el-table-column align="center" show-overflow-tooltip prop="businessType" label="业务类型" width="120">
               <template slot-scope="scope">
diff --git a/src/views/EquipmentRoamRecord/index.vue b/src/views/EquipmentRoamRecord/index.vue
index 30a0af06..6c05dcf7 100644
--- a/src/views/EquipmentRoamRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/index.vue
@@ -50,7 +50,7 @@
     </div>
 
     <div class="table-container" style="flex: 1; overflow-y: auto;">
-      <el-table :data="tableData" style="width: 100%">
+      <el-table :data="tableData" style="width: 100%" height="546">
         <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50"/>
         <el-table-column align="center" show-overflow-tooltip prop="createUser" label="操作人"/>
         <el-table-column align="center" show-overflow-tooltip prop="type" label="操作类型">
@@ -130,7 +130,7 @@
       </el-row>
 
       <vue-easy-print ref="recordPrintRef" tableShow style="width: 100%">
-        <el-table :data="outRecordData" style="width: 100%">
+        <el-table :data="outRecordData" style="width: 100%" height="546">
           <el-table-column align="center" show-overflow-tooltip type="index" label="序号"/>
           <el-table-column align="center" show-overflow-tooltip prop="devName" label="装备名称"/>
           <!-- <el-table-column align="center" show-overflow-tooltip prop="createUser" label="装备系列" /> -->
diff --git a/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue b/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
index e16c799c..cee96b07 100644
--- a/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <div class="table-container" style="flex: 1; overflow-y: auto;">
-        <el-table :data="tableData" style="width: 100%" border stripe>
+        <el-table :data="tableData" style="width: 100%" border stripe height="546">
           <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50"/>
           <el-table-column align="center" show-overflow-tooltip prop="createUser" label="操作人"/>
           <el-table-column align="center" show-overflow-tooltip prop="type" label="操作类型">
diff --git a/src/views/EquipmentRoamRecord/outboundRecord/index.vue b/src/views/EquipmentRoamRecord/outboundRecord/index.vue
index 98edb674..1ef55a8e 100644
--- a/src/views/EquipmentRoamRecord/outboundRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/outboundRecord/index.vue
@@ -41,7 +41,7 @@
         </el-col>
       </el-row>
     <div class="table-container">
-      <el-table :data="tableData" style="width: 100%" border stripe >
+      <el-table :data="tableData" style="width: 100%" border stripe height="546">
         <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50"/>
         <el-table-column align="center" show-overflow-tooltip prop="createUser" label="操作人"/>
         <el-table-column align="center" show-overflow-tooltip prop="type" label="操作类型">
diff --git a/src/views/EquipmentRoamRecord/retirementRecord/index.vue b/src/views/EquipmentRoamRecord/retirementRecord/index.vue
index c8ecd75e..e29c1be5 100644
--- a/src/views/EquipmentRoamRecord/retirementRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/retirementRecord/index.vue
@@ -43,7 +43,7 @@
         </el-col>
       </el-row>
     <div class="table-container">
-      <el-table :data="tableData" style="width: 100%" border stripe >
+      <el-table :data="tableData" style="width: 100%" border stripe height="546">
         <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50"/>
         <el-table-column align="center" show-overflow-tooltip prop="createUser" label="操作人"/>
         <el-table-column align="center" show-overflow-tooltip prop="type" label="操作类型">
diff --git a/src/views/EquipmentRoamRecord/returnRecord/index.vue b/src/views/EquipmentRoamRecord/returnRecord/index.vue
index ccb4788d..08ee58a1 100644
--- a/src/views/EquipmentRoamRecord/returnRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/returnRecord/index.vue
@@ -32,7 +32,7 @@
         </el-col>
       </el-row>
       <div class="table-container">
-        <el-table :data="tableData" style="width: 100%" border stripe>
+        <el-table :data="tableData" style="width: 100%" border stripe height="546">
           <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50"/>
           <el-table-column align="center" show-overflow-tooltip prop="createUser" label="操作人"/>
           <el-table-column align="center" show-overflow-tooltip prop="type" label="操作类型">
diff --git a/src/views/EquipmentServicing/index.vue b/src/views/EquipmentServicing/index.vue
index 0e098b0f..f7ae2442 100644
--- a/src/views/EquipmentServicing/index.vue
+++ b/src/views/EquipmentServicing/index.vue
@@ -68,6 +68,7 @@
           border
           stripe
           show-overflow-tooltip
+          height="546"
         >
           <el-table-column label="序号" type="index" align="center" width="80"/>
           <el-table-column prop="deviceName" label="装备名称" align="center"/>
@@ -285,6 +286,7 @@
           border
           stripe
           show-overflow-tooltip
+          height="546"
         >
           <el-table-column label="序号" type="index" align="center" width="80"/>
           <el-table-column prop="qcCode" label="质检编码" align="center"/>
diff --git a/src/views/EquipmentSharedLease/order/detail.vue b/src/views/EquipmentSharedLease/order/detail.vue
index 6670efc7..219d0f0f 100644
--- a/src/views/EquipmentSharedLease/order/detail.vue
+++ b/src/views/EquipmentSharedLease/order/detail.vue
@@ -173,6 +173,7 @@
             border
             :data="orderDetailDtoList"
             show-overflow-tooltip
+            height="546"
             :header-cell-style="{
               color: '#fff',
               background: '#00a288',
@@ -202,6 +203,7 @@
             :data="repairRecordList"
             border
             show-overflow-tooltip
+            height="546"
             :header-cell-style="{
               background: '#00a288',
               color: '#fff',
@@ -225,6 +227,7 @@
             :data="scrapRecordList"
             border
             show-overflow-tooltip
+            height="546"
             :header-cell-style="{
               background: '#00a288',
               color: '#fff',
@@ -249,6 +252,7 @@
             :data="lossRecordList"
             border
             show-overflow-tooltip
+            height="546"
             :header-cell-style="{
               background: '#00a288',
               color: '#fff',
@@ -274,6 +278,7 @@
         :data="viewFileInfoList"
         border
         show-overflow-tooltip
+        height="546"
         :header-cell-style="{
           background: '#00a288',
           color: '#fff',
diff --git a/src/views/EquipmentSharedLease/order/index.vue b/src/views/EquipmentSharedLease/order/index.vue
index 1151bbda..85662609 100644
--- a/src/views/EquipmentSharedLease/order/index.vue
+++ b/src/views/EquipmentSharedLease/order/index.vue
@@ -338,7 +338,7 @@
       </div>
       <div class="pagination-wrapper">
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
@@ -382,6 +382,7 @@
         border
         :data="orderDetailDtoList"
         show-overflow-tooltip
+        height="546"
         :header-cell-style="{
                     color: '#fff',
                     background: '#00a288',
@@ -447,6 +448,7 @@
         :data="repairRecordList"
         border
         show-overflow-tooltip
+        height="546"
         :header-cell-style="{
                     background: '#00a288',
                     color: '#fff',
@@ -506,6 +508,7 @@
         :data="scrapRecordList"
         border
         show-overflow-tooltip
+        height="546"
         :header-cell-style="{
                     background: '#00a288',
                     color: '#fff',
@@ -566,6 +569,7 @@
         :data="lossRecordList"
         border
         show-overflow-tooltip
+        height="546"
         :header-cell-style="{
                     background: '#00a288',
                     color: '#fff',
@@ -608,6 +612,7 @@
         :data="viewFileInfoList"
         border
         show-overflow-tooltip
+        height="546"
         :header-cell-style="{
                     background: '#00a288',
                     color: '#fff',
diff --git a/src/views/EquipmentSharedLease/order/sharedOutList.vue b/src/views/EquipmentSharedLease/order/sharedOutList.vue
index 124fb769..7b0d31d9 100644
--- a/src/views/EquipmentSharedLease/order/sharedOutList.vue
+++ b/src/views/EquipmentSharedLease/order/sharedOutList.vue
@@ -130,7 +130,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
diff --git a/src/views/EquipmentSharedOrder/order/detail.vue b/src/views/EquipmentSharedOrder/order/detail.vue
index d9e1f7a6..c51e6197 100644
--- a/src/views/EquipmentSharedOrder/order/detail.vue
+++ b/src/views/EquipmentSharedOrder/order/detail.vue
@@ -173,6 +173,7 @@
             border
             :data="orderDetailDtoList"
             show-overflow-tooltip
+            height="546"
             :header-cell-style="{
               color: '#fff',
               background: '#00a288',
@@ -206,6 +207,7 @@
               background: '#00a288',
               color: '#fff',
             }"
+            height="546"
           >
             <el-table-column prop="deviceName" align="center" label="装备名称" />
             <el-table-column prop="typeName" align="center" label="型号" />
@@ -229,6 +231,7 @@
               background: '#00a288',
               color: '#fff',
             }"
+            height="546"
           >
             <el-table-column prop="deviceName" align="center" label="装备名称" />
             <el-table-column prop="typeName" align="center" label="型号" />
@@ -253,6 +256,7 @@
               background: '#00a288',
               color: '#fff',
             }"
+            height="546"
           >
             <el-table-column prop="deviceName" align="center" label="装备名称" />
             <el-table-column prop="typeName" align="center" label="型号" />
@@ -278,6 +282,7 @@
           background: '#00a288',
           color: '#fff',
         }"
+        height="546"
       >
         <el-table-column prop="fileName" align="center" label="文件名称" />
         <el-table-column align="center" label="操作" width="120">
diff --git a/src/views/EquipmentSharedOrder/order/index.vue b/src/views/EquipmentSharedOrder/order/index.vue
index 994363cf..b033cf57 100644
--- a/src/views/EquipmentSharedOrder/order/index.vue
+++ b/src/views/EquipmentSharedOrder/order/index.vue
@@ -250,7 +250,7 @@
     <div class="pagination-wrapper">
     <!-- 分页 -->
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -287,6 +287,7 @@
         :data="orderDetailDtoList"
         show-overflow-tooltip
         :header-cell-style="{ color: '#fff', background: '#00a288' }"
+        height="546"
       >
         <el-table-column prop="code" align="center" label="装备编号"/>
         <el-table-column prop="deviceName" align="center" label="装备名称"/>
@@ -307,6 +308,7 @@
         border
         show-overflow-tooltip
         :header-cell-style="{ background: '#00a288', color: '#fff' }"
+        height="546"
       >
         <el-table-column prop="code" align="center" label="装备编号"/>
         <el-table-column prop="deviceName" align="center" label="装备名称"/>
@@ -358,6 +360,7 @@
         border
         show-overflow-tooltip
         :header-cell-style="{ background: '#00a288', color: '#fff' }"
+        height="546"
       >
         <el-table-column prop="code" align="center" label="装备编号"/>
         <el-table-column prop="deviceName" align="center" label="装备名称"/>
@@ -410,6 +413,7 @@
         border
         show-overflow-tooltip
         :header-cell-style="{ background: '#00a288', color: '#fff' }"
+        height="546"
       >
         <el-table-column prop="code" align="center" label="装备编号"/>
         <el-table-column prop="deviceName" align="center" label="装备名称"/>
@@ -445,6 +449,7 @@
         border
         show-overflow-tooltip
         :header-cell-style="{ background: '#00a288', color: '#fff' }"
+        height="546"
       >
         <el-table-column prop="fileName" align="center" label="文件名称"/>
         <el-table-column align="center" label="操作" width="120">
diff --git a/src/views/EquipmentTypeConfig/index.vue b/src/views/EquipmentTypeConfig/index.vue
index 1936be40..d0dae303 100644
--- a/src/views/EquipmentTypeConfig/index.vue
+++ b/src/views/EquipmentTypeConfig/index.vue
@@ -46,7 +46,7 @@
               style="width: 100%"
               border
               stripe
-              height="100%"
+              height="546"
               :loading="tableLoading"
             >
               <el-table-column
diff --git a/src/views/EquipmentUpOrDown/equipment/index.vue b/src/views/EquipmentUpOrDown/equipment/index.vue
index 35673b67..0ee81bcd 100644
--- a/src/views/EquipmentUpOrDown/equipment/index.vue
+++ b/src/views/EquipmentUpOrDown/equipment/index.vue
@@ -114,6 +114,7 @@
           border stripe
           @selection-change="handleSelectionChange"
           class="custom-table"
+          height="546"
         >
           <!-- 表格列保持原有内容 -->
           <el-table-column type="selection" width="55" align="center"/>
@@ -248,6 +249,7 @@
           border stripe
           @selection-change="handleSelectionChange"
           class="custom-table"
+          height="546"
         >
           <!-- 弹窗表格列保持原有内容 -->
           <el-table-column type="selection" width="55" align="center"/>
diff --git a/src/views/EquipmentUpOrDown/tool/index.vue b/src/views/EquipmentUpOrDown/tool/index.vue
index 6945f74e..45ed6d22 100644
--- a/src/views/EquipmentUpOrDown/tool/index.vue
+++ b/src/views/EquipmentUpOrDown/tool/index.vue
@@ -106,6 +106,7 @@
           :data="toolList"
           show-overflow-tooltip
           border stripe
+          height="546"
           @selection-change="handleSelectionChange"
         >
           <!-- 修复后的表格列代码 -->
@@ -226,6 +227,7 @@
           show-overflow-tooltip
           border stripe
           @selection-change="handleNumberSelectionChange"
+          height="546"
         >
           <!--复选列-->
           <el-table-column type="selection" width="55" align="center"/>
@@ -330,6 +332,7 @@
           :data="codeToolList"
           show-overflow-tooltip
           border stripe
+          height="546"
           @selection-change="handleCodeSelectionChange"
         >
           <!-- 复选列 -->
diff --git a/src/views/InterfaceConfig/index.vue b/src/views/InterfaceConfig/index.vue
index 3e10fdeb..271f3999 100644
--- a/src/views/InterfaceConfig/index.vue
+++ b/src/views/InterfaceConfig/index.vue
@@ -67,7 +67,7 @@
 
 
 
-            <el-table :data="tableData" style="width: 100%">
+            <el-table :data="tableData" style="width: 100%" height="546">
 
                 <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50" />
                 <el-table-column align="center" show-overflow-tooltip prop="date" label="系统名称" />
diff --git a/src/views/address-manage/index.vue b/src/views/address-manage/index.vue
index f3b0097f..df2e3e80 100644
--- a/src/views/address-manage/index.vue
+++ b/src/views/address-manage/index.vue
@@ -29,7 +29,7 @@
       show-overflow-tooltip
       border
       stripe
-      height="100%"
+      height="546"
     >
       <el-table-column align="center" label="序号" type="index" width="80" />
       <el-table-column align="center" label="收货地址">
diff --git a/src/views/business/apply/addApply.vue b/src/views/business/apply/addApply.vue
index 617fcf5f..d070ef42 100644
--- a/src/views/business/apply/addApply.vue
+++ b/src/views/business/apply/addApply.vue
@@ -79,7 +79,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -252,7 +252,7 @@
       </el-row>
 
       <!-- 设备列表表格 -->
-      <el-table ref="addTable" :data="addList" height="500" @selection-change="handleSelectionChange" border stripe>
+      <el-table ref="addTable" :data="addList" height="546" @selection-change="handleSelectionChange" border stripe>
         <el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
@@ -291,7 +291,7 @@
 
       <!-- 分页组件 -->
       <pagination
-        v-show="addTotal > 0"
+
         :total="addTotal"
         :page.sync="addQuery.pageNum"
         :limit.sync="addQuery.pageSize"
diff --git a/src/views/business/apply/applyList.vue b/src/views/business/apply/applyList.vue
index 5fd6b801..97000625 100644
--- a/src/views/business/apply/applyList.vue
+++ b/src/views/business/apply/applyList.vue
@@ -75,7 +75,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -112,7 +112,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/business/apply/components/AddApply.vue b/src/views/business/apply/components/AddApply.vue
index 70e07a84..5d7158bc 100644
--- a/src/views/business/apply/components/AddApply.vue
+++ b/src/views/business/apply/components/AddApply.vue
@@ -27,7 +27,7 @@
             <el-button type="primary" :disabled="dialogList.length == 0" @click="submit">确定</el-button>
           </el-col>
         </el-row>
-        <el-table :data="dialogList" border stripe highlight-current-row :max-height="500" style="width: 100%">
+        <el-table :data="dialogList" border stripe highlight-current-row height="546" style="width: 100%">
           <el-table-column type="index" width="55" label="序号" align="center" />
           <el-table-column
             v-for="(column, index) in dialogColumns"
diff --git a/src/views/business/audit/addAudit.vue b/src/views/business/audit/addAudit.vue
index cce16be4..d6583822 100644
--- a/src/views/business/audit/addAudit.vue
+++ b/src/views/business/audit/addAudit.vue
@@ -44,7 +44,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
diff --git a/src/views/business/audit/auditList.vue b/src/views/business/audit/auditList.vue
index 0ba71cb8..a80b03ee 100644
--- a/src/views/business/audit/auditList.vue
+++ b/src/views/business/audit/auditList.vue
@@ -69,7 +69,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -103,7 +103,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/business/outbound/details.vue b/src/views/business/outbound/details.vue
index 1a06a0ca..e653a97b 100644
--- a/src/views/business/outbound/details.vue
+++ b/src/views/business/outbound/details.vue
@@ -129,7 +129,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
diff --git a/src/views/business/outbound/index.vue b/src/views/business/outbound/index.vue
index 224038a3..027d4cfc 100644
--- a/src/views/business/outbound/index.vue
+++ b/src/views/business/outbound/index.vue
@@ -59,7 +59,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
 
@@ -99,7 +99,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/business/warehouse/auditDetails.vue b/src/views/business/warehouse/auditDetails.vue
index 1e184171..ffa905a4 100644
--- a/src/views/business/warehouse/auditDetails.vue
+++ b/src/views/business/warehouse/auditDetails.vue
@@ -48,7 +48,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
diff --git a/src/views/business/warehouse/auditList.vue b/src/views/business/warehouse/auditList.vue
index 7269551f..f5b089b7 100644
--- a/src/views/business/warehouse/auditList.vue
+++ b/src/views/business/warehouse/auditList.vue
@@ -85,7 +85,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -122,7 +122,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/business/warehouse/details.vue b/src/views/business/warehouse/details.vue
index 2c7832c7..cc33a891 100644
--- a/src/views/business/warehouse/details.vue
+++ b/src/views/business/warehouse/details.vue
@@ -87,7 +87,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="570"
+        height="546"
         style="width: 100%"
         @selection-change="handleSelectionChange"
       >
diff --git a/src/views/business/warehouse/index.vue b/src/views/business/warehouse/index.vue
index 984176d9..5f82da24 100644
--- a/src/views/business/warehouse/index.vue
+++ b/src/views/business/warehouse/index.vue
@@ -89,7 +89,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -132,7 +132,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/contract-manage/index.vue b/src/views/contract-manage/index.vue
index bbddd998..9776adeb 100644
--- a/src/views/contract-manage/index.vue
+++ b/src/views/contract-manage/index.vue
@@ -66,7 +66,7 @@
     <!-- 表格 -->
     <el-table
       :data="qualityLis"
-      border stripe height="100%"
+      border stripe height="546"
       show-overflow-tooltip
     >
       <el-table-column align="center" label="合同编码">
diff --git a/src/views/equipmentRepair/repairApply/SelectToolDialog.vue b/src/views/equipmentRepair/repairApply/SelectToolDialog.vue
index 424529f9..7b44e6cf 100644
--- a/src/views/equipmentRepair/repairApply/SelectToolDialog.vue
+++ b/src/views/equipmentRepair/repairApply/SelectToolDialog.vue
@@ -100,7 +100,7 @@
       v-loading="loading"
       :data="tableList"
       border stripe
-      height="550px"
+      height="546"
       :row-key="row => row.keyId"
       @selection-change="handleSelectionChange"
     >
diff --git a/src/views/equipmentRepair/repairApply/addRepair.vue b/src/views/equipmentRepair/repairApply/addRepair.vue
index bef50e03..d44ae610 100644
--- a/src/views/equipmentRepair/repairApply/addRepair.vue
+++ b/src/views/equipmentRepair/repairApply/addRepair.vue
@@ -18,7 +18,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <!-- 序号列 -->
@@ -115,7 +115,7 @@
       </el-table>
 
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/equipmentRepair/repairApply/repairList.vue b/src/views/equipmentRepair/repairApply/repairList.vue
index 07135535..e2ca3e5c 100644
--- a/src/views/equipmentRepair/repairApply/repairList.vue
+++ b/src/views/equipmentRepair/repairApply/repairList.vue
@@ -58,7 +58,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -103,7 +103,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/equipmentRepair/repairApply/repairView.vue b/src/views/equipmentRepair/repairApply/repairView.vue
index 84e0aec9..baea8112 100644
--- a/src/views/equipmentRepair/repairApply/repairView.vue
+++ b/src/views/equipmentRepair/repairApply/repairView.vue
@@ -14,7 +14,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <!-- 序号列 -->
diff --git a/src/views/equipmentRepair/repairAudit/repairApprovalDetail.vue b/src/views/equipmentRepair/repairAudit/repairApprovalDetail.vue
index 071bf4b7..19c3e9fa 100644
--- a/src/views/equipmentRepair/repairAudit/repairApprovalDetail.vue
+++ b/src/views/equipmentRepair/repairAudit/repairApprovalDetail.vue
@@ -43,7 +43,7 @@
           </el-col>
         </div>
 
-        <el-table ref="detailTable" :data="detailList" style="width: 100%" border stripe size="small" fit @selection-change="onSelectionChange">
+        <el-table ref="detailTable" :data="detailList" height="546" style="width: 100%" border stripe size="small" fit @selection-change="onSelectionChange">
           <el-table-column type="selection" width="50" />
           <el-table-column align="center" type="index" label="序号" width="80" />
           <el-table-column align="center" prop="type" label="分类" width="100" />
diff --git a/src/views/equipmentRepair/repairAudit/repairAuditList.vue b/src/views/equipmentRepair/repairAudit/repairAuditList.vue
index 187ec981..0e457ed7 100644
--- a/src/views/equipmentRepair/repairAudit/repairAuditList.vue
+++ b/src/views/equipmentRepair/repairAudit/repairAuditList.vue
@@ -55,7 +55,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -96,7 +96,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/equipmentRepair/repairAudit/repairDetailsAudit.vue b/src/views/equipmentRepair/repairAudit/repairDetailsAudit.vue
index 16fb409b..0e8e4e3e 100644
--- a/src/views/equipmentRepair/repairAudit/repairDetailsAudit.vue
+++ b/src/views/equipmentRepair/repairAudit/repairDetailsAudit.vue
@@ -18,7 +18,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
         @selection-change="handleSelectionChange"
       >
diff --git a/src/views/face/faceData/index.vue b/src/views/face/faceData/index.vue
index e8573692..bcd3d4c7 100644
--- a/src/views/face/faceData/index.vue
+++ b/src/views/face/faceData/index.vue
@@ -72,7 +72,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dataList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column type="index" label="序号" :index="indexMethod" width="50"/>
       <el-table-column label="名称" align="center" prop="name"/>
@@ -117,7 +117,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/face/faceGroups/index.vue b/src/views/face/faceGroups/index.vue
index 838d7b35..c538968a 100644
--- a/src/views/face/faceGroups/index.vue
+++ b/src/views/face/faceGroups/index.vue
@@ -62,7 +62,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="groupsList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="groupsList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column type="index" label="序号" :index="indexMethod" width="50"/>
       <el-table-column label="标识" align="center" prop="groupCode">
@@ -102,7 +102,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/leaseSearch/index.vue b/src/views/leaseSearch/index.vue
index db9f55ea..1a0ac78d 100644
--- a/src/views/leaseSearch/index.vue
+++ b/src/views/leaseSearch/index.vue
@@ -48,6 +48,7 @@
             fit
             highlight-current-row
             style="width: 100%"
+            height="546"
         >
             <el-table-column
                 type="index"
@@ -80,7 +81,7 @@
 
         <!-- 分页 -->
         <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
diff --git a/src/views/lessor/back/index.vue b/src/views/lessor/back/index.vue
index 30efd38d..24c03d98 100644
--- a/src/views/lessor/back/index.vue
+++ b/src/views/lessor/back/index.vue
@@ -89,7 +89,7 @@
                 >批量下架</el-button>
             </el-col>
       </el-row> 
-      <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange" border>
+      <el-table v-loading="loading" :data="tableList" height="546" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
@@ -130,7 +130,7 @@
       </el-table>
   
       <pagination
-        v-show="total>0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/lessor/demand/index.vue b/src/views/lessor/demand/index.vue
index 19a1b39e..a501266c 100644
--- a/src/views/lessor/demand/index.vue
+++ b/src/views/lessor/demand/index.vue
@@ -89,7 +89,7 @@
                 >批量下架</el-button>
             </el-col>
       </el-row> 
-      <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange" border>
+      <el-table v-loading="loading" :data="tableList" height="546" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
@@ -132,7 +132,7 @@
       </el-table>
   
       <pagination
-        v-show="total>0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/lessor/equipment/equipList/index.vue b/src/views/lessor/equipment/equipList/index.vue
index 1afd8e0f..250d4090 100644
--- a/src/views/lessor/equipment/equipList/index.vue
+++ b/src/views/lessor/equipment/equipList/index.vue
@@ -92,7 +92,7 @@
         </el-button>
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="maId"
+    <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="maId" height="546"
               @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
       <el-table-column label="序号" align="center" width="80" type="index">
@@ -147,7 +147,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/lessor/equipment/equipType/index.vue b/src/views/lessor/equipment/equipType/index.vue
index 5c3a48fb..5e203030 100644
--- a/src/views/lessor/equipment/equipType/index.vue
+++ b/src/views/lessor/equipment/equipType/index.vue
@@ -111,7 +111,7 @@
           v-loading="loading"
           :data="typeList"
           border
-
+          height="546"
         >
           <el-table-column type="selection" width="50" align="center"/>
           <el-table-column
@@ -177,7 +177,7 @@
         </el-table>
 
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/lessor/equipment/equipType/index1.vue b/src/views/lessor/equipment/equipType/index1.vue
index 765fbd48..f5d5e08c 100644
--- a/src/views/lessor/equipment/equipType/index1.vue
+++ b/src/views/lessor/equipment/equipType/index1.vue
@@ -127,6 +127,7 @@
           v-loading="loading"
           :data="typeList"
           border
+          height="546"
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="50" align="center"/>
@@ -226,7 +227,7 @@
         </el-table>
 
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/lessor/order/index.vue b/src/views/lessor/order/index.vue
index 2cb2e512..4eb27d1a 100644
--- a/src/views/lessor/order/index.vue
+++ b/src/views/lessor/order/index.vue
@@ -212,7 +212,7 @@
             </el-row>
         </div>
             <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
diff --git a/src/views/lessor/personal/index.vue b/src/views/lessor/personal/index.vue
index aa363985..8baef8b2 100644
--- a/src/views/lessor/personal/index.vue
+++ b/src/views/lessor/personal/index.vue
@@ -89,7 +89,7 @@
                 >批量下架</el-button>
             </el-col>
       </el-row> 
-      <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange" border>
+      <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" height="546" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
@@ -130,7 +130,7 @@
       </el-table>
   
       <pagination
-        v-show="total>0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue
index d0fae504..d30f970d 100644
--- a/src/views/material/back/component/addReturn.vue
+++ b/src/views/material/back/component/addReturn.vue
@@ -159,6 +159,7 @@
         <el-table
             v-loading="loading"
             :data="equipmentList" 
+            height="546"
             @selection-change="handleSelectionChange"
         >
             <el-table-column
@@ -304,7 +305,7 @@
                     <el-button type="primary" size="mini" @click="handleAddCode">添加编码</el-button>
                 </el-col>
             </el-row> -->
-            <el-table :data="machineList" width="100%" ref="codeTableList" height="450px"  row-key="maId"  @selection-change="codeSelectionChange">
+            <el-table :data="machineList" width="100%" ref="codeTableList" height="546"  row-key="maId"  @selection-change="codeSelectionChange">
                 <el-table-column type="selection" width="55" align="center" />
                 <el-table-column label="序号" type="index" width="55" align="center"/>
                 <el-table-column label="类型名称" prop="typeName" align="center" :show-overflow-tooltip="true">
diff --git a/src/views/material/back/component/dialogFormByCq.vue b/src/views/material/back/component/dialogFormByCq.vue
index 008ba045..59d79f36 100644
--- a/src/views/material/back/component/dialogFormByCq.vue
+++ b/src/views/material/back/component/dialogFormByCq.vue
@@ -28,7 +28,7 @@
             </div>
           </div>
         </div>
-        <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
+        <el-table :data="tableData" border height="546" style="width: 100%;margin-bottom: 10px;padding: 2px;">
           <el-table-column label="编号" align="center" type="index" />
           <el-table-column label="物资类型"
             align="center"
@@ -117,7 +117,7 @@
             </div>
           </div>
         </div>
-        <el-table :data="tableSubData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
+        <el-table :data="tableSubData" height="546" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
           <el-table-column label="序号" align="center" type="index" />
           <el-table-column prop="materialType" label="物资类型" align="center">
           </el-table-column>
diff --git a/src/views/material/back/component/home.vue b/src/views/material/back/component/home.vue
index 078762b9..c56a390a 100644
--- a/src/views/material/back/component/home.vue
+++ b/src/views/material/back/component/home.vue
@@ -149,6 +149,7 @@
         <el-table
             v-loading="loading"
             :data="typeList"
+            height="546"
             @selection-change="handleSelectionChange"
         >
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
@@ -306,7 +307,7 @@
         </el-table>
 
         <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/back/component/queryReturn.vue b/src/views/material/back/component/queryReturn.vue
index 337424ac..62512850 100644
--- a/src/views/material/back/component/queryReturn.vue
+++ b/src/views/material/back/component/queryReturn.vue
@@ -124,6 +124,7 @@
         <el-table
             v-loading="loading"
             :data="equipmentList"
+            height="546"
             @selection-change="handleSelectionChange"
         >
             <el-table-column
@@ -269,7 +270,7 @@
                     <el-button type="primary" size="mini" @click="handleAddCode">添加编码</el-button>
                 </el-col>
             </el-row> -->
-            <el-table :data="maCodeList" width="100%" height="450px">
+            <el-table :data="maCodeList" width="100%" height="546">
                 <el-table-column label="序号" type="index" width="55" align="center"/>
                 <el-table-column label="类型名称" prop="materialName" align="center" :show-overflow-tooltip="true">
                 </el-table-column>
diff --git a/src/views/material/basic/bmAssetAttributes/index.vue b/src/views/material/basic/bmAssetAttributes/index.vue
index 0c86e9ff..0627fa4e 100644
--- a/src/views/material/basic/bmAssetAttributes/index.vue
+++ b/src/views/material/basic/bmAssetAttributes/index.vue
@@ -76,6 +76,7 @@
           v-loading="loading"
           :data="propInfoList"
           border
+          height="546"
       >
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column
@@ -139,7 +140,7 @@
       </el-table>
 
       <pagination
-        v-show="total>0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/basic/bmProject/index.vue b/src/views/material/basic/bmProject/index.vue
index 326ba895..c8310cac 100644
--- a/src/views/material/basic/bmProject/index.vue
+++ b/src/views/material/basic/bmProject/index.vue
@@ -79,6 +79,7 @@
             :data="projectList"
             @selection-change="handleSelectionChange"
             border
+            height="546"
         >
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column
@@ -168,7 +169,7 @@
         </el-table>
 
         <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/basic/bmUnit/index.vue b/src/views/material/basic/bmUnit/index.vue
index d8cb9924..8ea4b056 100644
--- a/src/views/material/basic/bmUnit/index.vue
+++ b/src/views/material/basic/bmUnit/index.vue
@@ -78,6 +78,7 @@
             v-loading="loading"
             :data="unitList"
             border
+            height="546"
             @selection-change="handleSelectionChange"
         >
             <el-table-column
@@ -154,7 +155,7 @@
         </el-table>
 
         <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/basic/bmUnit/people.vue b/src/views/material/basic/bmUnit/people.vue
index 31785704..a4e509b9 100644
--- a/src/views/material/basic/bmUnit/people.vue
+++ b/src/views/material/basic/bmUnit/people.vue
@@ -102,6 +102,7 @@
         <el-table
           v-loading="loading"
           :data="userList"
+          height="546"
           @selection-change="handleSelectionChange"
         >
           <el-table-column
@@ -173,7 +174,7 @@
         </el-table>
 
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/basic/unitType/index.vue b/src/views/material/basic/unitType/index.vue
index 75f04f99..e53a55be 100644
--- a/src/views/material/basic/unitType/index.vue
+++ b/src/views/material/basic/unitType/index.vue
@@ -60,6 +60,7 @@
       v-loading="loading"
       :data="roleList"
       border
+      height="546"
       @selection-change="handleSelectionChange"
     >
       <el-table-column label="序号" type="index" width="100" align="center">
@@ -132,7 +133,7 @@
     </el-table>
 
     <!-- <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index f0d92184..b204689f 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -112,6 +112,7 @@
     <el-table
       v-loading="loading"
       :data="equipmentList"
+      height="546"
       @selection-change="handleSelectionChange"
     >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
index 28503aa8..08d8f583 100644
--- a/src/views/material/lease/apply/component/homeApply.vue
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -106,6 +106,7 @@
       row-key="id"
       @selection-change="handleSelectionChange"
       border
+      height="546"
     >
       <el-table-column
         type="selection"
@@ -261,7 +262,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -327,6 +328,7 @@
             class="table"
             style="margin-top: 20px; width: 1000px; padding-bottom: 1px"
             border
+            height="546"
           >
             <!--          <el-table-column type="selection" width="55" align="center" />-->
             <el-table-column label="序号" align="center" type="index" row="2" />
@@ -478,6 +480,7 @@
             class="table"
             border
             style="margin-top: 20px; padding: 1px"
+            height="546"
           >
             <el-table-column label="序号" align="center" type="index" />
             <el-table-column label="类型名称" align="center" prop="typeName" />
diff --git a/src/views/material/lease/apply/component/outbound.vue b/src/views/material/lease/apply/component/outbound.vue
index cbb96a4b..0cdc4904 100644
--- a/src/views/material/lease/apply/component/outbound.vue
+++ b/src/views/material/lease/apply/component/outbound.vue
@@ -99,7 +99,7 @@
             ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="leaseList" border>
+        <el-table v-loading="loading" :data="leaseList" border height="546">
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
             <el-table-column
                 align="center"
@@ -178,7 +178,7 @@
         </el-table>
 
         <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
@@ -232,7 +232,7 @@
                 </el-form-item>
             </el-form>
 
-            <el-table v-loading="loading" :data="dialogList">
+            <el-table v-loading="loading" :data="dialogList" height="546">
                 <el-table-column
                     align="center"
                     label="序号"
@@ -318,7 +318,7 @@
             </el-table>
 
             <pagination
-                v-show="dialogTotal > 0"
+                
                 :total="dialogTotal"
                 :page.sync="dialogQuery.pageNum"
                 :limit.sync="dialogQuery.pageSize"
@@ -370,7 +370,7 @@
                 </el-form>
 
                 <!-- 出库记录列表 -->
-                <el-table border :data="leaseOutDetailsList">
+                <el-table border :data="leaseOutDetailsList" height="546">
                     <el-table-column
                         align="center"
                         label="序号"
@@ -476,7 +476,7 @@
             <el-table
                 v-loading="loading"
                 :data="outCodeList"
-                height="500"
+                height="546"
                 @selection-change="handleSelectionChange"
             >
                 <el-table-column
@@ -571,7 +571,7 @@
                     >
                 </el-col>
             </el-row>
-            <el-table v-loading="loading" :data="outNumList" height="500">
+            <el-table v-loading="loading" :data="outNumList" height="546">
                 <el-table-column label="序号" align="center" type="index" />
                 <el-table-column
                     label="设备类型"
@@ -685,6 +685,7 @@
               :data="leaseOutDetailRecord"
               class="table"
               border
+              height="546"
               style="margin-top: 20px; padding: 1px"
             >
               <!--          <el-table-column type="selection" width="55" align="center" />-->
diff --git a/src/views/material/lease/apply/component/picking.vue b/src/views/material/lease/apply/component/picking.vue
index cbb96a4b..0cdc4904 100644
--- a/src/views/material/lease/apply/component/picking.vue
+++ b/src/views/material/lease/apply/component/picking.vue
@@ -99,7 +99,7 @@
             ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="leaseList" border>
+        <el-table v-loading="loading" :data="leaseList" border height="546">
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
             <el-table-column
                 align="center"
@@ -178,7 +178,7 @@
         </el-table>
 
         <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
@@ -232,7 +232,7 @@
                 </el-form-item>
             </el-form>
 
-            <el-table v-loading="loading" :data="dialogList">
+            <el-table v-loading="loading" :data="dialogList" height="546">
                 <el-table-column
                     align="center"
                     label="序号"
@@ -318,7 +318,7 @@
             </el-table>
 
             <pagination
-                v-show="dialogTotal > 0"
+                
                 :total="dialogTotal"
                 :page.sync="dialogQuery.pageNum"
                 :limit.sync="dialogQuery.pageSize"
@@ -370,7 +370,7 @@
                 </el-form>
 
                 <!-- 出库记录列表 -->
-                <el-table border :data="leaseOutDetailsList">
+                <el-table border :data="leaseOutDetailsList" height="546">
                     <el-table-column
                         align="center"
                         label="序号"
@@ -476,7 +476,7 @@
             <el-table
                 v-loading="loading"
                 :data="outCodeList"
-                height="500"
+                height="546"
                 @selection-change="handleSelectionChange"
             >
                 <el-table-column
@@ -571,7 +571,7 @@
                     >
                 </el-col>
             </el-row>
-            <el-table v-loading="loading" :data="outNumList" height="500">
+            <el-table v-loading="loading" :data="outNumList" height="546">
                 <el-table-column label="序号" align="center" type="index" />
                 <el-table-column
                     label="设备类型"
@@ -685,6 +685,7 @@
               :data="leaseOutDetailRecord"
               class="table"
               border
+              height="546"
               style="margin-top: 20px; padding: 1px"
             >
               <!--          <el-table-column type="selection" width="55" align="center" />-->
diff --git a/src/views/material/lease/apply/component/queryToolsApply.vue b/src/views/material/lease/apply/component/queryToolsApply.vue
index 3606e18f..3724dc6b 100644
--- a/src/views/material/lease/apply/component/queryToolsApply.vue
+++ b/src/views/material/lease/apply/component/queryToolsApply.vue
@@ -73,7 +73,7 @@
         >
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="equipmentList">
+    <el-table v-loading="loading" :data="equipmentList" height="546">
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column
         label="类型名称"
diff --git a/src/views/material/lease/outBound/component/addToolsOutBound.vue b/src/views/material/lease/outBound/component/addToolsOutBound.vue
index abec2deb..262727a1 100644
--- a/src/views/material/lease/outBound/component/addToolsOutBound.vue
+++ b/src/views/material/lease/outBound/component/addToolsOutBound.vue
@@ -83,7 +83,7 @@
             </el-col> -->
     </el-row>
 
-    <el-table v-loading="loading" :data="equipmentList">
+    <el-table v-loading="loading" :data="equipmentList" height="546">
       <el-table-column align="center" label="序号" type="index" width="55" />
       <el-table-column
         align="center"
@@ -208,7 +208,7 @@
           >
         </el-form-item>
       </el-form>
-      <el-table border max-height="600px" :data="codeTableList">
+      <el-table border max-height="600px" :data="codeTableList" height="546">
         <el-table-column align="center" label="序号" type="index" />
         <el-table-column align="center" label="设备名称" prop="materialName" />
         <el-table-column align="center" label="规格型号" prop="materialModel" />
diff --git a/src/views/material/lease/outBound/component/homeOutBound.vue b/src/views/material/lease/outBound/component/homeOutBound.vue
index 462ca0f6..d52c117d 100644
--- a/src/views/material/lease/outBound/component/homeOutBound.vue
+++ b/src/views/material/lease/outBound/component/homeOutBound.vue
@@ -76,6 +76,7 @@
       row-key="id"
       @selection-change="handleSelectionChange"
       border
+      height="546"
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column width="60" align="center" label="序号" type="index" />
@@ -209,7 +210,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -275,6 +276,7 @@
             class="table"
             style="margin-top: 20px; width: 1000px; padding-bottom: 1px"
             border
+            height="546"
           >
             <!--          <el-table-column type="selection" width="55" align="center" />-->
             <el-table-column label="序号" align="center" type="index" row="2" />
diff --git a/src/views/material/lease/outBound/component/queryToolsOutBound.vue b/src/views/material/lease/outBound/component/queryToolsOutBound.vue
index 9dd6a1c4..5b2cfbfa 100644
--- a/src/views/material/lease/outBound/component/queryToolsOutBound.vue
+++ b/src/views/material/lease/outBound/component/queryToolsOutBound.vue
@@ -78,7 +78,7 @@
         >
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="equipmentList">
+    <el-table v-loading="loading" :data="equipmentList" height="546">
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column
         label="类型名称"
diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index b9969a0a..11183598 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -64,7 +64,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="typeList" row-key="id" border>
+    <el-table v-loading="loading" :data="typeList" row-key="id" border height="546">
       <el-table-column width="60" align="center" label="序号" type="index" />
       <el-table-column
         align="center"
@@ -212,7 +212,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -259,7 +259,7 @@
           >
         </el-form-item>
       </el-form>
-      <el-table :data="getListOutInfo" width="600px" height="450">
+      <el-table :data="getListOutInfo" width="600px" height="546">
         <el-table-column
           label="类型名称"
           align="center"
@@ -310,7 +310,7 @@
         </el-table-column>
       </el-table>
       <pagination
-        v-show="dialogTotal > 0"
+        
         :total="dialogTotal"
         :page.sync="queryOutInfo.pageNum"
         :limit.sync="queryOutInfo.pageSize"
@@ -358,7 +358,7 @@
           >
         </el-form-item>
       </el-form>
-      <el-table :data="getListOutInfo" width="600px" height="450">
+      <el-table :data="getListOutInfo" width="600px" height="546">
         <el-table-column
           label="类型名称"
           align="center"
@@ -385,7 +385,7 @@
         />
       </el-table>
       <pagination
-        v-show="ViewTotal > 0"
+
         :total="ViewTotal"
         :page.sync="queryOutView.pageNum"
         :limit.sync="queryOutView.pageSize"
@@ -435,7 +435,7 @@
       <el-table
         v-loading="loadingTwo"
         :data="outCodeList"
-        height="500"
+        height="546"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
@@ -466,7 +466,7 @@
         />
       </el-table>
       <pagination
-        v-show="outTotal > 0"
+
         :total="outTotal"
         :page.sync="outQuery.pageNum"
         :limit.sync="outQuery.pageSize"
@@ -533,6 +533,7 @@
             class="table"
             style="margin-top: 20px; width: 1000px; padding-bottom: 1px"
             border
+            height="546"
           >
             <!--          <el-table-column type="selection" width="55" align="center" />-->
             <el-table-column label="序号" align="center" type="index" row="2" />
@@ -684,6 +685,7 @@
             class="table"
             border
             style="margin-top: 20px; padding: 1px"
+            height="546"
           >
             <el-table-column label="序号" align="center" type="index" />
             <el-table-column label="类型名称" align="center" prop="typeName" />
@@ -803,7 +805,7 @@
           >
         </el-col>
       </el-row>
-      <el-table v-loading="loading" :data="outNumList" height="500">
+      <el-table v-loading="loading" :data="outNumList" height="546">
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column
           label="设备类型"
diff --git a/src/views/material/lease/protocol/index.vue b/src/views/material/lease/protocol/index.vue
index a1eae4e1..179cae27 100644
--- a/src/views/material/lease/protocol/index.vue
+++ b/src/views/material/lease/protocol/index.vue
@@ -59,7 +59,7 @@
     </el-row>
 
 
-    <el-table v-loading="loading" :data="houseList" ref="multipleTable" row-key="teamId">
+    <el-table v-loading="loading" :data="houseList" ref="multipleTable" row-key="teamId" height="546">
       <el-table-column label="序号" align="center" width="80" type="index">
         <template slot-scope="scope">
           <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
@@ -126,7 +126,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/ma/device/index.vue b/src/views/material/ma/device/index.vue
index 6c69e84a..80913ef9 100644
--- a/src/views/material/ma/device/index.vue
+++ b/src/views/material/ma/device/index.vue
@@ -57,7 +57,7 @@
         </el-form-item>
       </el-form>
   
-      <el-table v-loading="loading" :data="deviceList" ref="multipleTable" row-key="teamId">
+      <el-table v-loading="loading" :data="deviceList" ref="multipleTable" row-key="teamId" height="546">
         <!-- <el-table-column type="selection" width="55" align="center" :reserve-selection="true" /> -->
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
@@ -108,7 +108,7 @@
       </el-table>
   
       <pagination
-        v-show="total>0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/ma/partType/index.vue b/src/views/material/ma/partType/index.vue
index 45a171eb..fce6ce8a 100644
--- a/src/views/material/ma/partType/index.vue
+++ b/src/views/material/ma/partType/index.vue
@@ -130,7 +130,7 @@
           ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="typeList" border>
+        <el-table v-loading="loading" :data="typeList" border height="546">
           <el-table-column label="序号" align="center" width="80" type="index">
             <template slot-scope="scope">
               <span>{{
@@ -217,7 +217,7 @@
           </el-table-column>
         </el-table>
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/ma/supplier/index.vue b/src/views/material/ma/supplier/index.vue
index 6e6c0609..00ec6040 100644
--- a/src/views/material/ma/supplier/index.vue
+++ b/src/views/material/ma/supplier/index.vue
@@ -97,7 +97,7 @@
       </div>
 
 
-      <el-table v-loading="loading" :data="houseList" ref="multipleTable" row-key="supplierId">
+      <el-table v-loading="loading" :data="houseList" ref="multipleTable" row-key="supplierId" height="546">
         <!-- <el-table-column type="selection" width="55" align="center" :reserve-selection="true" /> -->
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
@@ -145,7 +145,7 @@
       </el-table>
 
       <pagination
-        v-show="total>0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue
index a0efcefb..2559f5bb 100644
--- a/src/views/material/ma/type/index.vue
+++ b/src/views/material/ma/type/index.vue
@@ -105,7 +105,7 @@
               </el-button>
             </el-col>
           </el-row>
-          <el-table v-loading="loading" :data="typeList" border stripe>
+          <el-table v-loading="loading" :data="typeList" border stripe height="546">
             <el-table-column
               type="index"
               width="55"
@@ -143,7 +143,7 @@
           </el-table>
 
           <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/ma/typeConfigKeeper/index.vue b/src/views/material/ma/typeConfigKeeper/index.vue
index aea9faca..4466ede9 100644
--- a/src/views/material/ma/typeConfigKeeper/index.vue
+++ b/src/views/material/ma/typeConfigKeeper/index.vue
@@ -143,6 +143,7 @@
           row-key="typeId"
           default-expand-all
           :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+          height="546"
           @selection-change="handleSelectionChange"
           @select="handlerSelect"
           @select-all="handlerSelectAll"
@@ -223,7 +224,7 @@
         </el-table>
 
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/ma/typeConfigRepair/index.vue b/src/views/material/ma/typeConfigRepair/index.vue
index a0ce34a9..309a7fc4 100644
--- a/src/views/material/ma/typeConfigRepair/index.vue
+++ b/src/views/material/ma/typeConfigRepair/index.vue
@@ -143,6 +143,7 @@
           row-key="typeId"
           default-expand-all
           :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+          height="546"
           @selection-change="handleSelectionChange"
           @select="handlerSelect"
           @select-all="handlerSelectAll"
@@ -223,7 +224,7 @@
         </el-table>
 
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/ma/whHouse/index.vue b/src/views/material/ma/whHouse/index.vue
index 031ec582..98606b6c 100644
--- a/src/views/material/ma/whHouse/index.vue
+++ b/src/views/material/ma/whHouse/index.vue
@@ -77,6 +77,7 @@
       :data="houseList"
       ref="multipleTable"
       row-key="teamId"
+      height="546"
     >
       <!-- <el-table-column type="selection" width="55" align="center" :reserve-selection="true" /> -->
       <el-table-column label="序号" align="center" width="80" type="index">
@@ -133,7 +134,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue
index 45e63f13..419f5177 100644
--- a/src/views/material/purchase/goodsAccept/detail.vue
+++ b/src/views/material/purchase/goodsAccept/detail.vue
@@ -107,6 +107,7 @@
       :data="tableList"
       ref="multipleTable"
       row-key="typeId"
+      height="546"
       @selection-change="handleSelectionChange"
     >
       <el-table-column
@@ -214,7 +215,7 @@
     </el-table>
 
     <!-- <pagination
-        v-show="total>0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
@@ -231,7 +232,7 @@
         v-loading="dialogLoading"
         :data="fileDataList"
         width="100%"
-        height="350px"
+        height="546"
       >
         <el-table-column label="序号" type="index" width="55" align="center" />
         <el-table-column
diff --git a/src/views/material/purchase/goodsAccept/index.vue b/src/views/material/purchase/goodsAccept/index.vue
index ad4bd623..68e3bcf5 100644
--- a/src/views/material/purchase/goodsAccept/index.vue
+++ b/src/views/material/purchase/goodsAccept/index.vue
@@ -59,7 +59,7 @@
         </el-row>
 
         
-      <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange" border>
+      <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" height="546" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
@@ -110,7 +110,7 @@
       </el-table>
   
       <pagination
-        v-show="total>0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
@@ -184,6 +184,7 @@
                             padding-bottom: 1px;
                         "
                         border
+                        height="546"
                     >
                         <!--          <el-table-column type="selection" width="55" align="center" />-->
                         <el-table-column
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index fe436465..f00aba05 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -100,6 +100,7 @@
         <el-table
             v-loading="loading"
             :data="equipmentList"
+            height="546"
             @selection-change="handleSelectionChange"
         >
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
@@ -242,7 +243,7 @@
 
 
         <el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body>
-            <el-table :data="fileDataList" width="100%" height="350px">
+            <el-table :data="fileDataList" width="100%" height="546">
                 <el-table-column label="序号" type="index" width="55" align="center"/>
                 <el-table-column label="报告类型" align="center" prop="dictLabel" :show-overflow-tooltip="true"/>
                 <el-table-column label="文件名称" align="center" prop="name" :show-overflow-tooltip="true"/>
diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue
index 62dff761..3fd8849f 100644
--- a/src/views/material/purchase/goodsArrived/component/home.vue
+++ b/src/views/material/purchase/goodsArrived/component/home.vue
@@ -91,7 +91,7 @@
       ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" row-key="id" border>
+    <el-table v-loading="loading" :data="typeList" row-key="id" border height="546">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column width="60" align="center" label="序号" type="index" />
       <el-table-column
@@ -236,7 +236,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -302,6 +302,7 @@
             class="table"
             style="margin-top: 20px; width: 1000px; padding-bottom: 1px"
             border
+            height="546"
           >
             <!--          <el-table-column type="selection" width="55" align="center" />-->
             <el-table-column label="序号" align="center" type="index" row="2" />
@@ -419,7 +420,7 @@
       <el-table
         :data="getListPeople"
         width="600px"
-        height="450"
+        height="546"
         @selection-change="handleSelectionUser"
       >
         <el-table-column
@@ -485,7 +486,7 @@
         v-loading="loading"
         :data="userList"
         @selection-change="handleSelectionAddUser"
-        height="450"
+        height="546"
       >
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column label="序号" align="center" type="index" />
diff --git a/src/views/material/purchase/goodsArrived/component/queryTools.vue b/src/views/material/purchase/goodsArrived/component/queryTools.vue
index 20ede2f3..a30ce2bd 100644
--- a/src/views/material/purchase/goodsArrived/component/queryTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/queryTools.vue
@@ -9,6 +9,7 @@
         <el-table
             v-loading="loading"
             :data="equipmentList"
+            height="546"
         > 
             <el-table-column label="序号" align="center" type="index" />
             <el-table-column
@@ -79,7 +80,7 @@
 
 
         <el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body> 
-            <el-table :data="fileDataList" width="100%" height="350px">
+            <el-table :data="fileDataList" width="100%" height="546">
                 <el-table-column label="序号" type="index" width="55" align="center"/>
                 <el-table-column label="报告类型" align="center" prop="dictLabel" :show-overflow-tooltip="true"/>
                 <el-table-column label="文件名称" align="center" prop="name" :show-overflow-tooltip="true"/>
diff --git a/src/views/material/purchase/goodsBind/component/bindQrTools.vue b/src/views/material/purchase/goodsBind/component/bindQrTools.vue
index aa129a45..d09f5e7b 100644
--- a/src/views/material/purchase/goodsBind/component/bindQrTools.vue
+++ b/src/views/material/purchase/goodsBind/component/bindQrTools.vue
@@ -74,6 +74,7 @@
      <el-table
       v-loading="loading"
       :data="equipmentList"
+      height="546"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
@@ -156,7 +157,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="maForm.pageNum"
       :limit.sync="maForm.pageSize"
@@ -183,7 +184,7 @@
         v-loading="loadingTwo"
         :data="getListQr"
         width="800px"
-        height="600px"
+        height="546"
         @selection-change="handleSelectionChangeQr"
       >
         <!-- <el-table-column label="序号" align="center" prop="userName" sortable /> -->
@@ -247,7 +248,7 @@
       </el-table>
 
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryBind.pageNum"
         :limit.sync="queryBind.pageSize"
@@ -306,7 +307,7 @@
         v-loading="loadingTwo"
         :data="codeTableList"
         width="1000px"
-        height="600px"
+        height="546"
       >
         <el-table-column label="设备名称" align="center" prop="materialName" />
         <el-table-column label="规格型号" align="center" prop="materialModel" />
diff --git a/src/views/material/purchase/goodsBind/component/bindTools.vue b/src/views/material/purchase/goodsBind/component/bindTools.vue
index 151ad64e..49eb38f7 100644
--- a/src/views/material/purchase/goodsBind/component/bindTools.vue
+++ b/src/views/material/purchase/goodsBind/component/bindTools.vue
@@ -74,6 +74,7 @@
     <el-table
       v-loading="loading"
       :data="codeList"
+      height="546"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
@@ -168,7 +169,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="maForm.pageNum"
       :limit.sync="maForm.pageSize"
@@ -182,7 +183,7 @@
       title="查看编码"
       :visible.sync="viewCodeVisible"
     >
-      <el-table border max-height="600px" :data="viewCodeList">
+      <el-table border height="546" :data="viewCodeList">
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column align="center" label="类型名称" prop="maTypeName" />
         <el-table-column align="center" label="规格型号" prop="typeName" />
@@ -252,7 +253,7 @@
           </div>
         </el-form-item>
       </el-form>
-      <el-table border max-height="600px" :data="codeTableList">
+      <el-table border height="546" :data="codeTableList">
         <el-table-column align="center" label="序号" type="index" />
         <el-table-column align="center" label="设备名称" prop="maTypeName" />
         <el-table-column align="center" label="规格型号" prop="typeName" />
@@ -300,7 +301,7 @@
       width="900px"
       append-to-body
     >
-      <el-table :data="fileDataList" width="100%" height="350px">
+      <el-table :data="fileDataList" width="100%" height="546">
         <el-table-column label="序号" type="index" width="55" align="center" />
         <el-table-column
           label="报告类型"
diff --git a/src/views/material/purchase/goodsBind/component/home.vue b/src/views/material/purchase/goodsBind/component/home.vue
index 33a76968..92a12302 100644
--- a/src/views/material/purchase/goodsBind/component/home.vue
+++ b/src/views/material/purchase/goodsBind/component/home.vue
@@ -88,6 +88,7 @@
             border
             :data="bindList"
             v-loading="loading"
+            height="546"
             @selection-change="handleSelectionChange"
         >
             <el-table-column type="selection" width="55" align="center" />
@@ -186,7 +187,7 @@
 
         <pagination
             :total="total"
-            v-show="total > 0"
+            
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
             @pagination="getList"
diff --git a/src/views/material/purchase/goodsEntry/detail.vue b/src/views/material/purchase/goodsEntry/detail.vue
index ae17e523..4ead3b4a 100644
--- a/src/views/material/purchase/goodsEntry/detail.vue
+++ b/src/views/material/purchase/goodsEntry/detail.vue
@@ -65,7 +65,7 @@
           </el-col> -->
       </el-row>
 
-    <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="typeId" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="typeId" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" :reserve-selection="true" v-if="!isView"/>
       <el-table-column label="序号" align="center" width="80" type="index">
         
@@ -113,7 +113,7 @@
     </el-table>
 
     <!-- <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -121,7 +121,7 @@
     /> -->
 
     <el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body> 
-      <el-table v-loading="dialogLoading" :data="fileDataList" width="100%" height="350px">
+      <el-table v-loading="dialogLoading" :data="fileDataList" width="100%" height="546">
           <el-table-column label="序号" type="index" width="55" align="center"/>
           <el-table-column label="报告类型" align="center" prop="dictLabel" :show-overflow-tooltip="true"/>
           <el-table-column label="文件名称" align="center" prop="name" :show-overflow-tooltip="true"/>
@@ -172,7 +172,7 @@
                 <el-button type="primary" size="mini" @click="codeWarehouse">入库</el-button>
             </el-col>
         </el-row>
-        <el-table :data="codeTableData" width="100%" height="450px" row-key="id" @selection-change="codeSelection">
+        <el-table :data="codeTableData" width="100%" height="546" row-key="id" @selection-change="codeSelection">
             <el-table-column type="selection" width="55" align="center"   v-if="!isView"/>
             <el-table-column label="序号" type="index" width="55" align="center"/>
             <el-table-column label="类型名称" prop="typeName" align="center" :show-overflow-tooltip="true">
diff --git a/src/views/material/purchase/goodsEntry/index.vue b/src/views/material/purchase/goodsEntry/index.vue
index 78415531..57061438 100644
--- a/src/views/material/purchase/goodsEntry/index.vue
+++ b/src/views/material/purchase/goodsEntry/index.vue
@@ -91,6 +91,7 @@
             row-key="teamId"
             @selection-change="handleSelectionChange"
             border
+            height="546"
         >
             <el-table-column
                 type="selection"
@@ -209,7 +210,7 @@
         </el-table>
 
         <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
@@ -239,7 +240,7 @@
                             <span>到货日期：{{ printData.arrivalDate }}</span>
                         </div>
                     </div>
-                    <el-table :data="printTableData" class="table" border
+                    <el-table :data="printTableData" class="table" border height="546"
                         style="margin-top: 20px;width: 1000px;padding-bottom: 1px;">
                         <!--          <el-table-column type="selection" width="55" align="center" />-->
                         <el-table-column label="序号" align="center" type="index" row="2"
diff --git a/src/views/material/repair/repairManage/component/edit.vue b/src/views/material/repair/repairManage/component/edit.vue
index 7e9481c8..378223ca 100644
--- a/src/views/material/repair/repairManage/component/edit.vue
+++ b/src/views/material/repair/repairManage/component/edit.vue
@@ -64,6 +64,7 @@
     <el-table
       v-loading="loading"
       :data="equipmentList"
+      height="546"
       @selection-change="handleSelectionChange"
     >
       <el-table-column
@@ -134,7 +135,7 @@
           <el-button type="primary" size="mini">合格</el-button>
         </el-col>
       </el-row>
-      <el-table :data="repairDeviceList" width="100%" height="450px">
+      <el-table :data="repairDeviceList" width="100%" height="546">
         <el-table-column label="序号" type="index" width="55" align="center" />
         <el-table-column
           label="类型名称"
@@ -295,7 +296,7 @@
           >
         </el-col>
       </el-row>
-      <el-table :data="partTableList" width="100%" height="450px">
+      <el-table :data="partTableList" width="100%" height="546">
         <el-table-column label="序号" type="index" width="55" align="center" />
         <el-table-column
           label="配件名称"
@@ -415,7 +416,7 @@
           />
         </el-form-item>
       </el-form>
-      <el-table :data="backTableList" width="100%" height="450px">
+      <el-table :data="backTableList" width="100%" height="546">
         <el-table-column label="序号" type="index" width="55" align="center" />
         <el-table-column
           label="配件名称"
diff --git a/src/views/material/repair/repairManage/component/home.vue b/src/views/material/repair/repairManage/component/home.vue
index 6ec3ef6e..b272be1f 100644
--- a/src/views/material/repair/repairManage/component/home.vue
+++ b/src/views/material/repair/repairManage/component/home.vue
@@ -72,7 +72,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="tableList" height="546" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="序号" align="center" width="80" type="index">
                 <template slot-scope="scope">
@@ -106,7 +106,7 @@
         </el-table>
 
         <pagination
-            v-show="total > 0" :total="total"
+             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
             @pagination="getList"
@@ -218,6 +218,7 @@
             class="table"
             style="margin-top: 20px; width: 1000px; padding-bottom: 1px"
             border
+            height="546"
           >
             <!--          <el-table-column type="selection" width="55" align="center" />-->
             <!-- <el-table-column label="序号" align="center" type="index" row="2" /> -->
@@ -259,6 +260,7 @@
             class="table"
             style="margin-top: 20px; width: 1000px; padding-bottom: 1px"
             border
+            height="546"
           >
             <!--          <el-table-column type="selection" width="55" align="center" />-->
             <!-- <el-table-column label="序号" align="center" type="index" row="2" /> -->
diff --git a/src/views/material/repair/repairManage/component/view.vue b/src/views/material/repair/repairManage/component/view.vue
index e7c40b94..744d336c 100644
--- a/src/views/material/repair/repairManage/component/view.vue
+++ b/src/views/material/repair/repairManage/component/view.vue
@@ -146,6 +146,7 @@
         <el-table
             v-loading="loading"
             :data="backApplyDetails"
+            height="546"
             @selection-change="handleSelectionChange"
         >
             <el-table-column
@@ -268,7 +269,7 @@
                     <el-button type="primary" size="mini" @click="handleAddCode">保存</el-button>
                 </el-col>
             </el-row>
-            <el-table :data="codeDataList" width="100%" height="450px">
+            <el-table :data="codeDataList" width="100%" height="546">
                 <el-table-column label="序号" type="index" width="55" align="center"/>
                 <el-table-column label="类型名称" prop="typeName" align="center" :show-overflow-tooltip="true">
                 </el-table-column>
diff --git a/src/views/material/repair/testExamine/component/homeApply.vue b/src/views/material/repair/testExamine/component/homeApply.vue
index 32d746a9..fd731e22 100644
--- a/src/views/material/repair/testExamine/component/homeApply.vue
+++ b/src/views/material/repair/testExamine/component/homeApply.vue
@@ -106,6 +106,7 @@
       row-key="id"
       @selection-change="handleSelectionChange"
       border
+      height="546"
     >
       <el-table-column
         type="selection"
@@ -215,7 +216,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/material/repair/testExamine/component/queryToolsApply.vue b/src/views/material/repair/testExamine/component/queryToolsApply.vue
index ceab022f..5bd9bca2 100644
--- a/src/views/material/repair/testExamine/component/queryToolsApply.vue
+++ b/src/views/material/repair/testExamine/component/queryToolsApply.vue
@@ -68,6 +68,7 @@
       v-loading="loading"
       :data="equipmentList"
       row-key="id"
+      height="546"
       @selection-change="handleSelectionChange"
     >
       <el-table-column
@@ -170,7 +171,7 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="maForm.pageNum"
       :limit.sync="maForm.pageSize"
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index afab0a02..0bb59cd2 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -91,7 +91,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="jobList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
       <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
@@ -144,7 +144,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index a9472106..4c2c258b 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -101,7 +101,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="jobLogList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
       <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
@@ -136,7 +136,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index ca7cc8d6..f5de0216 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -27,6 +27,7 @@
       v-loading="loading"
       :data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
       style="width: 100%;"
+      height="546"
     >
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
@@ -54,7 +55,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
+    <pagination  :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
   </div>
 </template>
 
diff --git a/src/views/permission-template/index.vue b/src/views/permission-template/index.vue
index bc396916..32f0a0dc 100644
--- a/src/views/permission-template/index.vue
+++ b/src/views/permission-template/index.vue
@@ -70,6 +70,7 @@
             :selectable="checkSelectable"
             :row-class-name="getRowClassName"
             class="app-content"
+            height="546"
         >
             <el-table-column type="selection" min-width="55" align="center" />
             <el-table-column
@@ -122,7 +123,7 @@
         </el-table>
 
         <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
diff --git a/src/views/rent-facility/index.vue b/src/views/rent-facility/index.vue
index e9d7220d..8db09288 100644
--- a/src/views/rent-facility/index.vue
+++ b/src/views/rent-facility/index.vue
@@ -10,6 +10,7 @@
         show-overflow-tooltip
         :cell-style="{ textAlign: 'center' }"
         class="custom-table"
+        height="546"
       >
         <el-table-column width="240" align="center">
           <template slot="header">
diff --git a/src/views/rent-facility/line.vue b/src/views/rent-facility/line.vue
index 65da8a47..5ac64914 100644
--- a/src/views/rent-facility/line.vue
+++ b/src/views/rent-facility/line.vue
@@ -36,6 +36,7 @@
       :cell-style="{ textAlign: 'center' }"
       class="custom-table detail-table"
       stripe
+      height="546"
     >
       <el-table-column prop="index" label="序号" width="60">
         <template slot-scope="scope">
@@ -111,7 +112,7 @@
       :close-on-click-modal="false"
     >
       <div class="dialog-body-wrapper">
-        <el-table :data="ownDetailList" size="small" border class="custom-table" stripe>
+        <el-table :data="ownDetailList" size="small" border class="custom-table" stripe height="546">
           <el-table-column prop="index" label="序号" width="60">
             <template slot-scope="scope">
               {{ scope.$index + 1 }}
diff --git a/src/views/screen/cityScreen-old/EquipStatusMore.vue b/src/views/screen/cityScreen-old/EquipStatusMore.vue
index 7cd060ea..e6ac65f9 100644
--- a/src/views/screen/cityScreen-old/EquipStatusMore.vue
+++ b/src/views/screen/cityScreen-old/EquipStatusMore.vue
@@ -38,7 +38,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -73,7 +73,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/cityScreen-old/EquipTurnroundRate.vue b/src/views/screen/cityScreen-old/EquipTurnroundRate.vue
index bfc801e5..f7468727 100644
--- a/src/views/screen/cityScreen-old/EquipTurnroundRate.vue
+++ b/src/views/screen/cityScreen-old/EquipTurnroundRate.vue
@@ -37,7 +37,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -60,7 +60,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/cityScreen-old/EquipWarning.vue b/src/views/screen/cityScreen-old/EquipWarning.vue
index 31265480..890574e3 100644
--- a/src/views/screen/cityScreen-old/EquipWarning.vue
+++ b/src/views/screen/cityScreen-old/EquipWarning.vue
@@ -37,7 +37,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -60,7 +60,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/cityScreen-old/ProEquip.vue b/src/views/screen/cityScreen-old/ProEquip.vue
index 79783758..3775ad7b 100644
--- a/src/views/screen/cityScreen-old/ProEquip.vue
+++ b/src/views/screen/cityScreen-old/ProEquip.vue
@@ -37,7 +37,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -60,7 +60,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/cityScreen-old/RetirementWarning.vue b/src/views/screen/cityScreen-old/RetirementWarning.vue
index 017d0c2e..1cea9e8e 100644
--- a/src/views/screen/cityScreen-old/RetirementWarning.vue
+++ b/src/views/screen/cityScreen-old/RetirementWarning.vue
@@ -37,7 +37,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -60,7 +60,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/gwScreen/components/left/AllEquip.vue b/src/views/screen/gwScreen/components/left/AllEquip.vue
index bc650861..85b09da6 100644
--- a/src/views/screen/gwScreen/components/left/AllEquip.vue
+++ b/src/views/screen/gwScreen/components/left/AllEquip.vue
@@ -157,7 +157,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="550"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -192,7 +192,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/gwScreen/components/left/EquipStatusMore.vue b/src/views/screen/gwScreen/components/left/EquipStatusMore.vue
index d5de07ea..8a11cc62 100644
--- a/src/views/screen/gwScreen/components/left/EquipStatusMore.vue
+++ b/src/views/screen/gwScreen/components/left/EquipStatusMore.vue
@@ -44,7 +44,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="510"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -79,7 +79,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/gwScreen/components/left/RemarkMore.vue b/src/views/screen/gwScreen/components/left/RemarkMore.vue
index 21adb33e..857c0673 100644
--- a/src/views/screen/gwScreen/components/left/RemarkMore.vue
+++ b/src/views/screen/gwScreen/components/left/RemarkMore.vue
@@ -20,7 +20,7 @@
         </div>
 
         <!-- 表格 -->
-        <el-table :data="tableList" style="width: 100%" border :max-height="630">
+        <el-table :data="tableList" style="width: 100%" border height="546">
           <el-table-column type="index" width="55" label="序号" align="center" />
           <el-table-column prop="process" label="工序" align="center" />
           <el-table-column prop="equipmentName" label="装备名称" align="center" />
diff --git a/src/views/screen/gwScreen/components/left/UnitEquipConfig.vue b/src/views/screen/gwScreen/components/left/UnitEquipConfig.vue
index 68d4b32f..bebcdc2a 100644
--- a/src/views/screen/gwScreen/components/left/UnitEquipConfig.vue
+++ b/src/views/screen/gwScreen/components/left/UnitEquipConfig.vue
@@ -38,7 +38,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -73,7 +73,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/gwScreen/components/right/EquipUsageRateMore.vue b/src/views/screen/gwScreen/components/right/EquipUsageRateMore.vue
index ebbcb247..29fbf47b 100644
--- a/src/views/screen/gwScreen/components/right/EquipUsageRateMore.vue
+++ b/src/views/screen/gwScreen/components/right/EquipUsageRateMore.vue
@@ -19,7 +19,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -42,7 +42,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/gwScreen/components/right/ProEquipMore.vue b/src/views/screen/gwScreen/components/right/ProEquipMore.vue
index 6caaa076..892b2315 100644
--- a/src/views/screen/gwScreen/components/right/ProEquipMore.vue
+++ b/src/views/screen/gwScreen/components/right/ProEquipMore.vue
@@ -32,7 +32,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -55,7 +55,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/gwScreen/components/right/UsageRateMore.vue b/src/views/screen/gwScreen/components/right/UsageRateMore.vue
index d683af38..e0269a9b 100644
--- a/src/views/screen/gwScreen/components/right/UsageRateMore.vue
+++ b/src/views/screen/gwScreen/components/right/UsageRateMore.vue
@@ -19,7 +19,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -42,7 +42,7 @@
 
         <!-- 分页 -->
         <!-- <pagination
-          v-show="total > 0"
+          
           :total="88"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/wsScreen/components/left/AllEquip.vue b/src/views/screen/wsScreen/components/left/AllEquip.vue
index ff86d968..4b347776 100644
--- a/src/views/screen/wsScreen/components/left/AllEquip.vue
+++ b/src/views/screen/wsScreen/components/left/AllEquip.vue
@@ -186,7 +186,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :max-height="340"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -221,7 +221,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/wsScreen/components/left/EquipStatusMore.vue b/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
index d5de07ea..8a11cc62 100644
--- a/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
+++ b/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
@@ -44,7 +44,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="510"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -79,7 +79,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/wsScreen/components/left/RemarkMore.vue b/src/views/screen/wsScreen/components/left/RemarkMore.vue
index 21adb33e..857c0673 100644
--- a/src/views/screen/wsScreen/components/left/RemarkMore.vue
+++ b/src/views/screen/wsScreen/components/left/RemarkMore.vue
@@ -20,7 +20,7 @@
         </div>
 
         <!-- 表格 -->
-        <el-table :data="tableList" style="width: 100%" border :max-height="630">
+        <el-table :data="tableList" style="width: 100%" border height="546">
           <el-table-column type="index" width="55" label="序号" align="center" />
           <el-table-column prop="process" label="工序" align="center" />
           <el-table-column prop="equipmentName" label="装备名称" align="center" />
diff --git a/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue b/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
index cd192a59..67c6ddc7 100644
--- a/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
+++ b/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
@@ -19,7 +19,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
diff --git a/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue b/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue
index 82755cd8..caab0be6 100644
--- a/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue
+++ b/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue
@@ -19,7 +19,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :max-height="550"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -42,7 +42,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/wsScreen/components/right/ProEquipMore.vue b/src/views/screen/wsScreen/components/right/ProEquipMore.vue
index ab609389..0a0e8629 100644
--- a/src/views/screen/wsScreen/components/right/ProEquipMore.vue
+++ b/src/views/screen/wsScreen/components/right/ProEquipMore.vue
@@ -32,7 +32,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="515"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -55,7 +55,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/wsScreen/components/right/UsageRateMore.vue b/src/views/screen/wsScreen/components/right/UsageRateMore.vue
index 02cef482..34f8b189 100644
--- a/src/views/screen/wsScreen/components/right/UsageRateMore.vue
+++ b/src/views/screen/wsScreen/components/right/UsageRateMore.vue
@@ -19,7 +19,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -42,7 +42,7 @@
 
         <!-- 分页 -->
         <!-- <pagination
-          v-show="total > 0"
+          
           :total="88"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/wsScreenWidescreen/components/left/AllEquip.vue b/src/views/screen/wsScreenWidescreen/components/left/AllEquip.vue
index 9c6af1ed..90456698 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/AllEquip.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/AllEquip.vue
@@ -186,7 +186,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="550"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -221,7 +221,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/wsScreenWidescreen/components/left/EquipStatusMore.vue b/src/views/screen/wsScreenWidescreen/components/left/EquipStatusMore.vue
index 68d4b32f..bebcdc2a 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/EquipStatusMore.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/EquipStatusMore.vue
@@ -38,7 +38,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -73,7 +73,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/wsScreenWidescreen/components/left/RemarkMore.vue b/src/views/screen/wsScreenWidescreen/components/left/RemarkMore.vue
index 21adb33e..857c0673 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/RemarkMore.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/RemarkMore.vue
@@ -20,7 +20,7 @@
         </div>
 
         <!-- 表格 -->
-        <el-table :data="tableList" style="width: 100%" border :max-height="630">
+        <el-table :data="tableList" style="width: 100%" border height="546">
           <el-table-column type="index" width="55" label="序号" align="center" />
           <el-table-column prop="process" label="工序" align="center" />
           <el-table-column prop="equipmentName" label="装备名称" align="center" />
diff --git a/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue b/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue
index 93dfc755..9f28afc6 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue
@@ -19,7 +19,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
diff --git a/src/views/screen/wsScreenWidescreen/components/right/EquipUsageRateMore.vue b/src/views/screen/wsScreenWidescreen/components/right/EquipUsageRateMore.vue
index 0e9d8493..fcd92add 100644
--- a/src/views/screen/wsScreenWidescreen/components/right/EquipUsageRateMore.vue
+++ b/src/views/screen/wsScreenWidescreen/components/right/EquipUsageRateMore.vue
@@ -19,7 +19,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -42,7 +42,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/wsScreenWidescreen/components/right/ProEquipMore.vue b/src/views/screen/wsScreenWidescreen/components/right/ProEquipMore.vue
index 63e6c286..94c8dd50 100644
--- a/src/views/screen/wsScreenWidescreen/components/right/ProEquipMore.vue
+++ b/src/views/screen/wsScreenWidescreen/components/right/ProEquipMore.vue
@@ -32,7 +32,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -55,7 +55,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/screen/wsScreenWidescreen/components/right/UsageRateMore.vue b/src/views/screen/wsScreenWidescreen/components/right/UsageRateMore.vue
index 3af8f111..afbf61c4 100644
--- a/src/views/screen/wsScreenWidescreen/components/right/UsageRateMore.vue
+++ b/src/views/screen/wsScreenWidescreen/components/right/UsageRateMore.vue
@@ -19,7 +19,7 @@
           stripe
           highlight-current-row
           style="width: 100%"
-          :height="600"
+          height="546"
           class="table-container"
         >
           <el-table-column
@@ -42,7 +42,7 @@
 
         <!-- 分页 -->
         <!-- <pagination
-          v-show="total > 0"
+          
           :total="88"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/search/equipment/index.vue b/src/views/search/equipment/index.vue
index 21608bb9..e1f5bcb9 100644
--- a/src/views/search/equipment/index.vue
+++ b/src/views/search/equipment/index.vue
@@ -73,7 +73,7 @@
     </el-row> -->
     <el-card class="content-box">
       <div class="table-container">
-        <el-table v-loading="loading" :data="tableData" border stripe height="100%">
+        <el-table v-loading="loading" :data="tableData" border stripe height="546">
           <el-table-column label="序号" align="center" width="80" type="index">
             <template slot-scope="scope">
               <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
@@ -103,7 +103,7 @@
       </div>
       <div class="pagination-wrapper">
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
diff --git a/src/views/search/lease/index.vue b/src/views/search/lease/index.vue
index d84f4a9b..2f6f5600 100644
--- a/src/views/search/lease/index.vue
+++ b/src/views/search/lease/index.vue
@@ -82,7 +82,7 @@
     </el-row> -->
     <el-card class="content-box">
       <div class="table-container">
-        <el-table v-loading="loading" :data="tableData" border stripe height="100%">
+        <el-table v-loading="loading" :data="tableData" border stripe height="546">
           <el-table-column label="序号" align="center" width="80" type="index">
             <template slot-scope="scope">
               <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
@@ -129,7 +129,7 @@
       </div>
       <div class="pagination-wrapper">
         <pagination
-          v-show="total>0"
+          
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
@@ -185,7 +185,7 @@
 
       </el-form>
 
-      <el-table v-loading="loadingTwo" :data="deviceList" width="800px" height="600px" border stripe>
+      <el-table v-loading="loadingTwo" :data="deviceList" width="800px" height="546" border stripe>
         <el-table-column label="序号" align="center" width="80" type="index">
           <!-- <template slot-scope="scope">
             <span>{{ (queryDevice.pageNum - 1) * queryDevice.pageSize + scope.$index + 1 }}</span>
@@ -217,7 +217,7 @@
       </el-table>
 
       <pagination
-        v-show="totalTwo>0"
+
         :total="totalTwo"
         :page.sync="queryDevice.pageNum"
         :limit.sync="queryDevice.pageSize"
diff --git a/src/views/search/order/detail.vue b/src/views/search/order/detail.vue
index 34226c20..559f09b2 100644
--- a/src/views/search/order/detail.vue
+++ b/src/views/search/order/detail.vue
@@ -215,6 +215,7 @@
                     color: '#fff',
                     background: '#00a288',
                 }"
+                height="546"
             >
                 <el-table-column prop="deviceName" align="center" label="装备名称" />
                 <el-table-column prop="typeName" align="center" label="型号" />
@@ -246,6 +247,7 @@
                     background: '#00a288',
                     color: '#fff',
                 }"
+                height="546"
             >
                 <el-table-column prop="deviceName" align="center" label="装备名称" />
                 <el-table-column prop="typeName" align="center" label="型号" />
@@ -274,6 +276,7 @@
                     background: '#00a288',
                     color: '#fff',
                 }"
+                height="546"
             >
                 <el-table-column prop="deviceName" align="center" label="装备名称" />
                 <el-table-column prop="typeName" align="center" label="型号" />
@@ -303,6 +306,7 @@
                     background: '#00a288',
                     color: '#fff',
                 }"
+                height="546"
             >
                 <el-table-column prop="deviceName" align="center" label="装备名称" />
                 <el-table-column prop="typeName" align="center" label="型号" />
@@ -330,6 +334,7 @@
                 background: '#00a288',
                 color: '#fff',
             }"
+            height="546"
         >
             <el-table-column prop="fileName" align="center" label="文件名称" />
             <el-table-column align="center" label="操作" width="120">
diff --git a/src/views/search/order/index.vue b/src/views/search/order/index.vue
index 212976ae..59beee77 100644
--- a/src/views/search/order/index.vue
+++ b/src/views/search/order/index.vue
@@ -311,7 +311,7 @@
         </div>
     </template>
             <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
@@ -358,6 +358,7 @@
                     color: '#fff',
                     background: '#00a288',
                 }"
+                height="546"
             >
                 <el-table-column prop="code" align="center" label="装备编号" />
                 <el-table-column prop="deviceName" align="center" label="装备名称" />
@@ -423,6 +424,7 @@
                     background: '#00a288',
                     color: '#fff',
                 }"
+                height="546"
             >
                 <el-table-column prop="code" align="center" label="装备编号" />
                 <el-table-column prop="deviceName" align="center" label="装备名称" />
@@ -481,6 +483,7 @@
                     background: '#00a288',
                     color: '#fff',
                 }"
+                height="546"
             >
                 <el-table-column prop="code" align="center" label="装备编号" />
                 <el-table-column prop="deviceName" align="center" label="装备名称" />
@@ -540,6 +543,7 @@
                     background: '#00a288',
                     color: '#fff',
                 }"
+                height="546"
             >
                 <el-table-column prop="code" align="center" label="装备编号" />
                 <el-table-column prop="deviceName" align="center" label="装备名称" />
@@ -582,6 +586,7 @@
                     background: '#00a288',
                     color: '#fff',
                 }"
+                height="546"
             >
                 <el-table-column prop="fileName" align="center" label="文件名称" />
                 <el-table-column align="center" label="操作" width="120">
diff --git a/src/views/sourcingNeed/index.vue b/src/views/sourcingNeed/index.vue
index 1b1f0fb3..04cb0d32 100644
--- a/src/views/sourcingNeed/index.vue
+++ b/src/views/sourcingNeed/index.vue
@@ -107,7 +107,7 @@
         <el-table
           :data="leaseList"
           show-overflow-tooltip
-          border stripe height="100%"
+          border stripe height="546"
         >
           <el-table-column align="center" label="序号" type="index" width="80"/>
           <el-table-column align="center" label="需求编号">
diff --git a/src/views/swiper-manage/index.vue b/src/views/swiper-manage/index.vue
index 4600e677..36fa4694 100644
--- a/src/views/swiper-manage/index.vue
+++ b/src/views/swiper-manage/index.vue
@@ -15,7 +15,7 @@
             </el-col>
         </el-row>
 
-        <el-table :data="swiperList" border>
+        <el-table :data="swiperList" border height="546">
             <el-table-column
                 label="序号"
                 align="center"
diff --git a/src/views/system/approval/components/ProcessDialog.vue b/src/views/system/approval/components/ProcessDialog.vue
index e0a8f3cb..943ba364 100644
--- a/src/views/system/approval/components/ProcessDialog.vue
+++ b/src/views/system/approval/components/ProcessDialog.vue
@@ -34,7 +34,7 @@
       <!-- 审批节点配置 -->
       <el-form-item label="审批节点">
         <el-button type="primary" size="small" @click="handleAddNode">添加节点</el-button>
-        <el-table :data="form.nodeList" style="margin-top: 10px" border>
+        <el-table :data="form.nodeList" style="margin-top: 10px" border height="546">
           <el-table-column prop="nodeOrder" label="节点顺序" width="80" />
           <el-table-column prop="nodeName" label="节点名称" min-width="80" />
           <el-table-column prop="approverType" label="审批人类型" width="100">
diff --git a/src/views/system/approval/detail.vue b/src/views/system/approval/detail.vue
index f6b2ebb1..087161ef 100644
--- a/src/views/system/approval/detail.vue
+++ b/src/views/system/approval/detail.vue
@@ -27,7 +27,7 @@
 
       <!-- 审批节点 -->
       <div class="section-title" style="margin-top: 30px">审批节点配置</div>
-      <el-table :data="process.nodeList" border stripe style="margin-top: 10px">
+      <el-table :data="process.nodeList" border stripe height="546" style="margin-top: 10px">
         <el-table-column prop="nodeOrder" label="节点顺序" width="80" />
         <el-table-column prop="nodeCode" label="节点编码" width="120" />
         <el-table-column prop="nodeName" label="节点名称" min-width="150" />
diff --git a/src/views/system/approval/index.vue b/src/views/system/approval/index.vue
index 77218073..0f9362ac 100644
--- a/src/views/system/approval/index.vue
+++ b/src/views/system/approval/index.vue
@@ -43,6 +43,7 @@
         :data="tableList"
         border
         stripe
+        height="546"
       >
         <el-table-column prop="id" label="ID" width="60" />
         <el-table-column prop="processCode" label="流程编码" width="220" />
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 79b2c204..e1d1d21e 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -109,7 +109,7 @@
       </div>
     </el-row>
 
-    <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="configList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="参数主键" align="center" prop="configId" />
       <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
@@ -147,7 +147,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index d7c263da..c1732b98 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -89,6 +89,7 @@
             row-key="deptId"
             :default-expand-all="isExpandAll"
             :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+            height="546"
         >
             <el-table-column
                 prop="deptName"
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index a3ee103e..4c4405e5 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -90,7 +90,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dataList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编码" align="center" prop="dictCode" />
       <el-table-column label="字典标签" align="center" prop="dictLabel">
@@ -133,7 +133,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index bf81fce8..edc6e36a 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -114,7 +114,7 @@
       </div>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="typeList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编号" align="center" prop="dictId" />
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
@@ -157,7 +157,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/system/equipment/authRole.vue b/src/views/system/equipment/authRole.vue
index b282fd32..b15134d8 100644
--- a/src/views/system/equipment/authRole.vue
+++ b/src/views/system/equipment/authRole.vue
@@ -17,7 +17,7 @@
     </el-form>
 
     <h4 class="form-header h4">角色信息</h4>
-    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="filteredRoles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
+    <el-table v-loading="loading" height="546" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="filteredRoles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
           <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
@@ -34,7 +34,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
+    <pagination  :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
 
     <el-form label-width="100px">
       <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
diff --git a/src/views/system/equipment/index.vue b/src/views/system/equipment/index.vue
index 5204971e..886db5e7 100644
--- a/src/views/system/equipment/index.vue
+++ b/src/views/system/equipment/index.vue
@@ -51,6 +51,7 @@
           :data="userList"
           @row-dblclick="handleRowDblClick"
           :row-class-name="getRowClassName"
+          height="546"
         >
           <el-table-column label="装备分类" align="center" key="equipmentName" prop="equipmentName"
                            :show-overflow-tooltip="true"
@@ -71,7 +72,7 @@
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+        <pagination  :total="total" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize" @pagination="getList"
         />
       </el-col>
diff --git a/src/views/system/ipWhitelist/index.vue b/src/views/system/ipWhitelist/index.vue
index 991f4a00..abe69725 100644
--- a/src/views/system/ipWhitelist/index.vue
+++ b/src/views/system/ipWhitelist/index.vue
@@ -72,7 +72,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="whitelistList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="whitelistList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column type="index" label="序号" width="50"/>
       <el-table-column label="IP地址" align="center" prop="ipAddress" min-width="120px">
@@ -115,7 +115,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/system/lockUser/index.vue b/src/views/system/lockUser/index.vue
index 7d8d23bc..7067b011 100644
--- a/src/views/system/lockUser/index.vue
+++ b/src/views/system/lockUser/index.vue
@@ -13,7 +13,7 @@
       </el-col>
     </el-row>
 
-    <el-table  ref="multipleTable" v-loading="loading" @row-click="handleRowClick" :data="list" @selection-change="handleSelectionChange">
+    <el-table  ref="multipleTable" v-loading="loading" height="546" @row-click="handleRowClick" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column type="index" label="序号" width="50"/>
       <el-table-column label="用户名" align="center" prop="userName"/>
diff --git a/src/views/system/log/abnormalLog/index.vue b/src/views/system/log/abnormalLog/index.vue
index c062acb0..ad162dcc 100644
--- a/src/views/system/log/abnormalLog/index.vue
+++ b/src/views/system/log/abnormalLog/index.vue
@@ -129,7 +129,7 @@
       fit
       highlight-current-row
       style="width: 100%"
-      :max-height="tableHeight"
+      height="546"
     >
       <el-table-column label="序号" align="center" width="80" type="index">
         <template slot-scope="scope">
@@ -175,7 +175,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
diff --git a/src/views/system/log/businessLog/index.vue b/src/views/system/log/businessLog/index.vue
index 0b23278e..cf698fac 100644
--- a/src/views/system/log/businessLog/index.vue
+++ b/src/views/system/log/businessLog/index.vue
@@ -76,7 +76,7 @@
         fit
         highlight-current-row
         style="width: 100%"
-        :max-height="tableHeight"
+        height="546"
       >
         <el-table-column label="序号" align="center" width="80" type="index">
           <template scope="scope">
@@ -101,7 +101,7 @@
       </el-table>
 
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="listQuery.pageNum"
         :limit.sync="listQuery.pageSize"
diff --git a/src/views/system/log/systemLog/index.vue b/src/views/system/log/systemLog/index.vue
index 81974b95..b99bb01d 100644
--- a/src/views/system/log/systemLog/index.vue
+++ b/src/views/system/log/systemLog/index.vue
@@ -74,7 +74,7 @@
       fit
       highlight-current-row
       style="width: 100%"
-      :max-height="tableHeight"
+      height="546"
     >
       <el-table-column label="序号" align="center" width="80" type="index">
         <template scope="scope">
@@ -99,7 +99,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
diff --git a/src/views/system/logininfor/index.vue b/src/views/system/logininfor/index.vue
index d94c2186..b66be1d2 100644
--- a/src/views/system/logininfor/index.vue
+++ b/src/views/system/logininfor/index.vue
@@ -103,7 +103,7 @@
     </el-row>
 
     <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange"
-              :default-sort="defaultSort" @sort-change="handleSortChange"
+              :default-sort="defaultSort" @sort-change="handleSortChange" height="546"
     >
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="访问编号" align="center" prop="infoId"/>
@@ -127,7 +127,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 0d44f173..2ab97714 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -62,7 +62,7 @@
       row-key="menuId"
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-      :max-height="680"
+      height="546"
     >
       <el-table-column prop="menuName" label="菜单名称" align="center" :show-overflow-tooltip="true" width="160"></el-table-column>
       <el-table-column prop="icon" label="图标" align="center" min-width="100">
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index ba4d2f6f..78b597bf 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -79,7 +79,7 @@
       </div>
     </el-row>
 
-    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="noticeList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
         label="序号"
@@ -131,7 +131,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/system/operlog/index.vue b/src/views/system/operlog/index.vue
index a5b633c5..8762c8cb 100644
--- a/src/views/system/operlog/index.vue
+++ b/src/views/system/operlog/index.vue
@@ -111,7 +111,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table ref="tables" v-loading="loading" :data="list" height="546" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="日志编号" align="center" prop="operId" />
       <el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />
@@ -152,7 +152,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 974912a7..3c24a8b0 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -86,7 +86,7 @@
       </div>
     </el-row>
 
-    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="postList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="岗位编号" align="center" prop="postId" />
       <el-table-column label="岗位编码" align="center" prop="postCode" />
@@ -123,7 +123,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/system/project/index.vue b/src/views/system/project/index.vue
index 5d83bf83..49d63bfd 100644
--- a/src/views/system/project/index.vue
+++ b/src/views/system/project/index.vue
@@ -96,7 +96,7 @@
         <el-table
           :data="projectList"
           show-overflow-tooltip
-          border stripe height="100%"
+          border stripe height="546"
           @selection-change="handleSelectionChange"
         >
           <!--复选列-->
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 147aa33e..4c8cd16d 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -59,7 +59,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="userList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
       <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
@@ -89,7 +89,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 6a7f780f..27eacabd 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -108,7 +108,7 @@
         </el-row>
       </div>
 
-      <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange" :selectable="checkSelectable" :row-class-name="getRowClassName">
+      <el-table v-loading="loading" :data="roleList" height="546" @selection-change="handleSelectionChange" :selectable="checkSelectable" :row-class-name="getRowClassName">
         <el-table-column type="selection" min-width="55" align="center"/>
         <el-table-column label="角色编号" prop="roleId" min-width="120" align="center"/>
         <el-table-column label="角色名称" align="center" prop="roleName" :show-overflow-tooltip="true" min-width="150"/>
@@ -169,7 +169,7 @@
 
 
       <pagination
-        v-show="total>0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 9507502f..cf60c371 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -24,7 +24,7 @@
       </el-form-item>
     </el-form>
     <el-row>
-      <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
+      <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="546">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
@@ -42,7 +42,7 @@
         </el-table-column>
       </el-table>
       <pagination
-        v-show="total>0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index b282fd32..b15134d8 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -17,7 +17,7 @@
     </el-form>
 
     <h4 class="form-header h4">角色信息</h4>
-    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="filteredRoles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
+    <el-table v-loading="loading" height="546" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="filteredRoles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
           <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
@@ -34,7 +34,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
+    <pagination  :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
 
     <el-form label-width="100px">
       <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 6b769ed0..5d9f5f6e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -106,7 +106,7 @@
             </el-row>
           </div>
 
-          <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"
+          <el-table v-loading="loading" :data="userList" height="546" @selection-change="handleSelectionChange"
                     :selectable="checkSelectable" :row-class-name="getRowClassName">
             <el-table-column type="selection" width="50" align="center"/>
             <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
@@ -186,7 +186,7 @@
             </el-table-column>
           </el-table>
 
-          <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          <pagination  :total="total" :page.sync="queryParams.pageNum"
                       :limit.sync="queryParams.pageSize" @pagination="getList"
           />
 
diff --git a/src/views/tenantry/order/index.vue b/src/views/tenantry/order/index.vue
index 11c7e400..a8ef558a 100644
--- a/src/views/tenantry/order/index.vue
+++ b/src/views/tenantry/order/index.vue
@@ -212,7 +212,7 @@
             </el-row>
         </div>
             <pagination
-            v-show="total > 0"
+            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 3aa4a770..47adb9b8 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -24,7 +24,7 @@
       </el-form-item>
     </el-form>
     <el-row>
-      <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
+      <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="546">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true"></el-table-column>
@@ -32,7 +32,7 @@
         <el-table-column prop="updateTime" label="更新时间"></el-table-column>
       </el-table>
       <pagination
-        v-show="total>0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 7e0ee6b9..83c1910b 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -80,7 +80,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="tableList" height="546" @selection-change="handleSelectionChange">
       <el-table-column type="selection" align="center" width="55"></el-table-column>
       <el-table-column label="序号" type="index" width="50" align="center">
         <template slot-scope="scope">
@@ -151,7 +151,7 @@
       </el-table-column>
     </el-table>
     <pagination
-      v-show="total>0"
+      
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
diff --git a/src/views/toolsManage/codeToolsLedger/index.vue b/src/views/toolsManage/codeToolsLedger/index.vue
index 0b17599f..ca62b900 100644
--- a/src/views/toolsManage/codeToolsLedger/index.vue
+++ b/src/views/toolsManage/codeToolsLedger/index.vue
@@ -94,7 +94,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -129,7 +129,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/toolsManage/toolsApplication/addTools.vue b/src/views/toolsManage/toolsApplication/addTools.vue
index 2a9bdf29..4aa3b39b 100644
--- a/src/views/toolsManage/toolsApplication/addTools.vue
+++ b/src/views/toolsManage/toolsApplication/addTools.vue
@@ -59,7 +59,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -95,7 +95,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/toolsManage/toolsApplication/applicantList.vue b/src/views/toolsManage/toolsApplication/applicantList.vue
index ef8ccf5e..2b4c40dd 100644
--- a/src/views/toolsManage/toolsApplication/applicantList.vue
+++ b/src/views/toolsManage/toolsApplication/applicantList.vue
@@ -69,7 +69,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -107,7 +107,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/toolsManage/toolsApplication/components/AddCode.vue b/src/views/toolsManage/toolsApplication/components/AddCode.vue
index 32823b45..3c9729ce 100644
--- a/src/views/toolsManage/toolsApplication/components/AddCode.vue
+++ b/src/views/toolsManage/toolsApplication/components/AddCode.vue
@@ -69,7 +69,7 @@
             <el-button type="primary" :disabled="dialogList.length == 0" @click="submit">确定</el-button>
           </el-col>
         </el-row>
-        <el-table :data="dialogList" border stripe highlight-current-row :max-height="500" style="width: 100%">
+        <el-table :data="dialogList" border stripe highlight-current-row height="546" style="width: 100%">
           <el-table-column type="index" width="55" label="序号" align="center" />
           <el-table-column
             v-for="(column, index) in dialogColumns"
diff --git a/src/views/toolsManage/toolsApplication/components/AddNum.vue b/src/views/toolsManage/toolsApplication/components/AddNum.vue
index c26ee6f9..4cbfc1e9 100644
--- a/src/views/toolsManage/toolsApplication/components/AddNum.vue
+++ b/src/views/toolsManage/toolsApplication/components/AddNum.vue
@@ -27,7 +27,7 @@
             <el-button type="primary" :disabled="dialogList.length == 0" @click="submit">确定</el-button>
           </el-col>
         </el-row>
-        <el-table :data="dialogList" border stripe highlight-current-row :max-height="500" style="width: 100%">
+        <el-table :data="dialogList" border stripe highlight-current-row height="546" style="width: 100%">
           <el-table-column type="index" width="55" label="序号" align="center" />
           <el-table-column
             v-for="(column, index) in dialogColumns"
diff --git a/src/views/toolsManage/toolsApprove/approveList.vue b/src/views/toolsManage/toolsApprove/approveList.vue
index 0ad3c312..6d0bb139 100644
--- a/src/views/toolsManage/toolsApprove/approveList.vue
+++ b/src/views/toolsManage/toolsApprove/approveList.vue
@@ -63,7 +63,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -99,7 +99,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/toolsManage/toolsApprove/approveToolsDetails.vue b/src/views/toolsManage/toolsApprove/approveToolsDetails.vue
index 9a376024..5ddc51c0 100644
--- a/src/views/toolsManage/toolsApprove/approveToolsDetails.vue
+++ b/src/views/toolsManage/toolsApprove/approveToolsDetails.vue
@@ -58,7 +58,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -110,7 +110,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
diff --git a/src/views/toolsManage/toolsApprove/components/Details.vue b/src/views/toolsManage/toolsApprove/components/Details.vue
index ccb8063f..876b84c4 100644
--- a/src/views/toolsManage/toolsApprove/components/Details.vue
+++ b/src/views/toolsManage/toolsApprove/components/Details.vue
@@ -2,7 +2,7 @@
   <div>
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="80%" :close-on-click-modal="false">
       <el-card v-loading="isLoading">
-        <el-table :data="dialogList" border stripe highlight-current-row :max-height="500" style="width: 100%">
+        <el-table :data="dialogList" border stripe highlight-current-row height="546" style="width: 100%">
           <el-table-column type="index" width="55" label="序号" align="center" />
           <el-table-column
             v-for="(column, index) in dialogColumns"
@@ -18,7 +18,7 @@
 
         <!-- 分页 -->
         <pagination
-          v-show="total > 0"
+          
           :total="total"
           :page.sync="dialogForm.pageNum"
           :limit.sync="dialogForm.pageSize"
diff --git a/src/views/toolsManage/toolsLedger/index.vue b/src/views/toolsManage/toolsLedger/index.vue
index 834b12c0..eacb3656 100644
--- a/src/views/toolsManage/toolsLedger/index.vue
+++ b/src/views/toolsManage/toolsLedger/index.vue
@@ -86,7 +86,7 @@
         highlight-current-row
         border
         stripe
-        :max-height="650"
+        height="546"
         style="width: 100%"
       >
         <el-table-column
@@ -115,7 +115,7 @@
 
       <!-- 分页 -->
       <pagination
-        v-show="total > 0"
+        
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
@@ -140,7 +140,7 @@
         fit
         highlight-current-row
         v-loading="isLoading"
-        :max-height="500"
+        height="546"
         border
         stripe
         style="width: 100%"
@@ -176,7 +176,7 @@
       </el-table>
       <!-- 分页 -->
       <pagination
-        v-show="dlgTotal > 0"
+
         :total="dlgTotal"
         :page.sync="dialogForm.pageNum"
         :limit.sync="dialogForm.pageSize"