diff --git a/hb_client/src/App.vue b/hb_client/src/App.vue
index a63f8c2..41edc07 100644
--- a/hb_client/src/App.vue
+++ b/hb_client/src/App.vue
@@ -92,4 +92,8 @@ export default {
 .ganttLeftMenu .el-table .el-table__row--level-0 .cell{
   font-weight: bold!important;;
 }
+/* tabs阴影去除 */
+.el-tabs--border-card{
+  box-shadow: none!important;;
+}
 </style>
diff --git a/hb_client/src/views/cms/article.vue b/hb_client/src/views/cms/article.vue
index 4aee150..8554d7a 100644
--- a/hb_client/src/views/cms/article.vue
+++ b/hb_client/src/views/cms/article.vue
@@ -44,7 +44,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="标题" prop="title">
diff --git a/hb_client/src/views/customerManage/customer.vue b/hb_client/src/views/customerManage/customer.vue
index b358c5b..3e68332 100644
--- a/hb_client/src/views/customerManage/customer.vue
+++ b/hb_client/src/views/customerManage/customer.vue
@@ -44,7 +44,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="客户名称" prop="name" min-width="200" show-overflow-tooltip>
diff --git a/hb_client/src/views/customerManage/feedback.vue b/hb_client/src/views/customerManage/feedback.vue
index e4abb89..4ab8fd9 100644
--- a/hb_client/src/views/customerManage/feedback.vue
+++ b/hb_client/src/views/customerManage/feedback.vue
@@ -34,7 +34,7 @@
           stripe
           highlight-current-row
           height="100"
-          v-el-height-adaptive-table="{bottomOffset: 45}"
+          v-el-height-adaptive-table="{bottomOffset: 50}"
         >
           <el-table-column label="序号" type="index" width="80"/>
           
diff --git a/hb_client/src/views/em/equipment.vue b/hb_client/src/views/em/equipment.vue
index e4e1ae1..cb80a0e 100644
--- a/hb_client/src/views/em/equipment.vue
+++ b/hb_client/src/views/em/equipment.vue
@@ -44,7 +44,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="设备名称" prop="name" min-width="120" show-overflow-tooltip>
diff --git a/hb_client/src/views/em/maintenance.vue b/hb_client/src/views/em/maintenance.vue
index 0c41981..8bc6ac5 100644
--- a/hb_client/src/views/em/maintenance.vue
+++ b/hb_client/src/views/em/maintenance.vue
@@ -81,7 +81,7 @@
           stripe
           highlight-current-row
           height="100"
-          v-el-height-adaptive-table="{bottomOffset: 42}"
+          v-el-height-adaptive-table="{bottomOffset: 50}"
         >
           <el-table-column label="序号" type="index" width="80"/>
           
diff --git a/hb_client/src/views/em/monitoring.vue b/hb_client/src/views/em/monitoring.vue
index b406d44..67c5499 100644
--- a/hb_client/src/views/em/monitoring.vue
+++ b/hb_client/src/views/em/monitoring.vue
@@ -43,7 +43,7 @@
         fit
         stripe
         height="100"
-        v-el-height-adaptive-table="{ bottomOffset: 42 }"
+        v-el-height-adaptive-table="{ bottomOffset: 50 }"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="设备编号" width="100">
diff --git a/hb_client/src/views/em/record.vue b/hb_client/src/views/em/record.vue
index 52367a8..ab0c64e 100644
--- a/hb_client/src/views/em/record.vue
+++ b/hb_client/src/views/em/record.vue
@@ -44,7 +44,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="设备名称">
diff --git a/hb_client/src/views/inm/fifo.vue b/hb_client/src/views/inm/fifo.vue
index c1c16c3..e10261a 100644
--- a/hb_client/src/views/inm/fifo.vue
+++ b/hb_client/src/views/inm/fifo.vue
@@ -60,7 +60,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{ bottomOffset: 42 }"
+        v-el-height-adaptive-table="{ bottomOffset: 50 }"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="记录编号" prop="number"></el-table-column>
diff --git a/hb_client/src/views/inm/logistics.vue b/hb_client/src/views/inm/logistics.vue
index f3e5538..2a6653c 100644
--- a/hb_client/src/views/inm/logistics.vue
+++ b/hb_client/src/views/inm/logistics.vue
@@ -33,7 +33,7 @@
           stripe
           highlight-current-row
           height="100"
-          v-el-height-adaptive-table="{bottomOffset: 45}"
+          v-el-height-adaptive-table="{bottomOffset: 50}"
         >
           <el-table-column type="index" width="50"/>
           <el-table-column label="单号" prop="order">
diff --git a/hb_client/src/views/inm/materialbatch.vue b/hb_client/src/views/inm/materialbatch.vue
index b2250be..93caec1 100644
--- a/hb_client/src/views/inm/materialbatch.vue
+++ b/hb_client/src/views/inm/materialbatch.vue
@@ -35,7 +35,7 @@
         highlight-current-row
       
           height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="物料批次">
diff --git a/hb_client/src/views/inm/product.vue b/hb_client/src/views/inm/product.vue
index 9c83387..2631255 100644
--- a/hb_client/src/views/inm/product.vue
+++ b/hb_client/src/views/inm/product.vue
@@ -18,7 +18,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column type="index" width="50"/>
diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue
index fbe1a69..a82e4c3 100644
--- a/hb_client/src/views/inm/warehouse.vue
+++ b/hb_client/src/views/inm/warehouse.vue
@@ -44,7 +44,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="仓库名称" prop="name">
diff --git a/hb_client/src/views/inm/wproduct.vue b/hb_client/src/views/inm/wproduct.vue
index 47c2956..6bf81fc 100644
--- a/hb_client/src/views/inm/wproduct.vue
+++ b/hb_client/src/views/inm/wproduct.vue
@@ -11,7 +11,7 @@
         highlight-current-row
         
           height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="半成品编号">
diff --git a/hb_client/src/views/mtm/knowledgeBase.vue b/hb_client/src/views/mtm/knowledgeBase.vue
index c8cfff9..d135de1 100644
--- a/hb_client/src/views/mtm/knowledgeBase.vue
+++ b/hb_client/src/views/mtm/knowledgeBase.vue
@@ -32,7 +32,7 @@
           stripe
           highlight-current-row
           height="100"
-          v-el-height-adaptive-table="{bottomOffset: 42}"
+          v-el-height-adaptive-table="{bottomOffset: 50}"
         >
           <el-table-column label="序号" type="index" width="80"/>
           <el-table-column label="资料类别" prop="type" min-width="120">
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index 651bdf6..4fe2e07 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -28,7 +28,7 @@
         </el-button>
       </div>
     </el-card>
-    <el-card style="margin-top: 2px">
+    <el-card>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <!--<el-tab-pane label="成品" name="1"></el-tab-pane>
         <el-tab-pane label="半成品" name="2"></el-tab-pane>-->
@@ -43,7 +43,6 @@
         border
         fit
         stripe
-        highlight-current-row
         height="100"
         v-el-height-adaptive-table="{bottomOffset: 50}"
       >
@@ -308,9 +307,7 @@
         },
       };
     },
-    computed: {},
-    watch: {},
-    created() {
+    mounted(){
       this.getList();
       this.getProcessList();
     },
diff --git a/hb_client/src/views/mtm/productList.vue b/hb_client/src/views/mtm/productList.vue
index d208cbd..be9fff8 100644
--- a/hb_client/src/views/mtm/productList.vue
+++ b/hb_client/src/views/mtm/productList.vue
@@ -45,7 +45,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="成品编号">
diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue
index 073a693..7ab9b73 100644
--- a/hb_client/src/views/mtm/productprocess.vue
+++ b/hb_client/src/views/mtm/productprocess.vue
@@ -4,9 +4,7 @@
       <el-col :span="9">
         <el-card>
           <div slot="header" class="clearfix">
-            <span style="font-size: 16px;
-    font-weight: 700;
-">产品列表</span>
+            <span style="font-size: 16px;font-weight: 700;">产品列表</span>
           </div>
           <el-table
             v-loading="listLoading"
@@ -17,7 +15,7 @@
             height="100"
             @current-change="handleCurrentChange"
             highlight-current-row
-            v-el-height-adaptive-table="{bottomOffset: 10}"
+            v-el-height-adaptive-table="{bottomOffset: 20}"
           >
             <el-table-column type="index" width="50"/>
             <el-table-column label="产品编号">
@@ -35,9 +33,7 @@
       <el-col :span="15">
         <el-card class="box-card" id="processCard">
           <div slot="header" class="clearfix">
-            <span style="font-size: 16px;
-    font-weight: 700;
-">工艺流程</span>
+            <span style="font-size: 16px;font-weight: 700;">工艺流程</span>
           </div>
           <el-steps :active="values" spac="400px" align-center="" style="padding-top: 20px;height:80px">
             <el-step
@@ -51,9 +47,7 @@
         </el-card>
         <el-card class="box-card">
           <div slot="header" class="clearfix">
-            <span style="font-size: 16px;
-    font-weight: 700;
-">流程分解</span>
+            <span style="font-size: 16px;font-weight: 700;">流程分解</span>
           </div>
           <el-button v-if="checkPermission(['subproduction_create'])" type="primary" icon="el-icon-plus"
                      @click="handlesubproducationCreate">
@@ -147,7 +141,7 @@
             </div>
           </el-dialog>
         </el-card>
-        <el-tabs type="border-card">
+        <el-tabs type="border-card" style="box-shadow: none;border-radius: 5px;">
           <el-tab-pane label="输入物料">
             <el-button
               v-if="checkPermission(['subproduction_update'])"
@@ -772,7 +766,7 @@
       let that = this;
       let hei = document.getElementsByClassName('app-main')[0].clientHeight;
       let h = document.getElementById('processCard').clientHeight;
-      that.halfHeight = (hei - h - 176) / 2;
+      that.halfHeight = (hei - h - 200) / 2;
       this.getmaterialList();//物料列表
     },
     methods: {
diff --git a/hb_client/src/views/mtm/wproductList.vue b/hb_client/src/views/mtm/wproductList.vue
index a6aab9b..e701a17 100644
--- a/hb_client/src/views/mtm/wproductList.vue
+++ b/hb_client/src/views/mtm/wproductList.vue
@@ -43,7 +43,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="半成品编号">
diff --git a/hb_client/src/views/personnel/attendance.vue b/hb_client/src/views/personnel/attendance.vue
index 615e53a..b3eadca 100644
--- a/hb_client/src/views/personnel/attendance.vue
+++ b/hb_client/src/views/personnel/attendance.vue
@@ -5,13 +5,13 @@
         <el-tab-pane label="今日到岗">
           <el-table
             :data="userList.results"
-            style="width: 100%; margin-top: 6px"
+            style="width: 100%;"
             highlight-current-row
             row-key="id"
             height="100"
             stripe
             border
-            v-el-height-adaptive-table="{ bottomOffset: 41 }"
+            v-el-height-adaptive-table="{ bottomOffset: 57 }"
           >
             <el-table-column type="index" width="50" label="序号"/>
             <el-table-column align="center" prop="number" label="工号">
diff --git a/hb_client/src/views/personnel/user.vue b/hb_client/src/views/personnel/user.vue
index 76249f7..fdd27c7 100644
--- a/hb_client/src/views/personnel/user.vue
+++ b/hb_client/src/views/personnel/user.vue
@@ -37,7 +37,7 @@
         height="100"
         stripe
         border
-        v-el-height-adaptive-table="{bottomOffset: 41}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column align="center" label="工号" prop="number">
diff --git a/hb_client/src/views/pm/management.vue b/hb_client/src/views/pm/management.vue
index b62b4b9..6dd4dda 100644
--- a/hb_client/src/views/pm/management.vue
+++ b/hb_client/src/views/pm/management.vue
@@ -170,8 +170,6 @@
                 list.push(item)
               }
             });
-            // debugger;
-            // console.log(list);
             list.forEach(item => {
               if (!item.children || item.children.length < 1) {
                 let startTime = new Date(item.start_date).getTime();
@@ -233,8 +231,6 @@
                 arr.push(obj);
               }
               that.proList = arr;
-              // debugger;
-              // console.log(arr)
             });
           } else {
             that.$message.error(res.msg);
@@ -252,7 +248,6 @@
             let arr = [];
             debugger;
             list.forEach((item) => {
-              // if (!item.children || item.children.length < 1) {
               let startTime = new Date(item.start_date).getTime();
               let endTime = new Date(item.end_date).getTime();
               let obj = new Object();
@@ -268,7 +263,6 @@
               obj.productNum = item.product_.specification;
               obj.isShow = true;
               arr.push(obj);
-              // }
               that.proList = arr;
             });
           }
@@ -283,7 +277,7 @@
     mounted() {
       let hei = document.getElementsByClassName('app-main')[0].clientHeight;//
       // let h = document.getElementById('ganttCard').clientHeight;//
-      this.domHeight = hei - 460;
+      this.domHeight = hei - 470;
     }
   };
 </script>
diff --git a/hb_client/src/views/pm/plan.vue b/hb_client/src/views/pm/plan.vue
index da9c19f..59b0f17 100644
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@@ -138,7 +138,9 @@
       type="border-card"
       v-model="activeName"
       @tab-click="activeNameClick"
+      style="box-shadow: none;"
     >
+    
       <el-tab-pane label="订单排产" name="订单排产">
         <el-table
           :data="orderList.results"
@@ -523,7 +525,7 @@
     },
     mounted() {
       let hei = document.getElementsByClassName('app-main')[0].clientHeight;//
-      let domHeight = this.domHeight =  (hei - 205) / 2;
+      let domHeight = this.domHeight =  (hei - 220) / 2;
       document.getElementById('orderList').style.height = domHeight + 'px';
       document.getElementById('productionPlan').style.height = domHeight + 'px';
     }
diff --git a/hb_client/src/views/pm/resources.vue b/hb_client/src/views/pm/resources.vue
index 701d248..bb8260d 100644
--- a/hb_client/src/views/pm/resources.vue
+++ b/hb_client/src/views/pm/resources.vue
@@ -21,7 +21,7 @@
             stripe
             highlight-current-row
             height="100"
-            v-el-height-adaptive-table="{ bottomOffset: 44 }"
+            v-el-height-adaptive-table="{ bottomOffset: 50 }"
           >
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column label="订单编号" width="110">
@@ -77,7 +77,7 @@
           />
         </el-card>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" style="padding-left: 5px;">
         <el-row>
           <el-col :span="24">
             <el-card>
@@ -370,7 +370,7 @@
     },
     mounted() {
       let hei = document.getElementsByClassName('app-main')[0].clientHeight;//
-      let domHeight = this.domHeight =  (hei - 116) / 2;
+      let domHeight = this.domHeight =  (hei - 130) / 2;
       document.getElementById('orderList').style.height = domHeight + 'px';
       document.getElementById('productionPlan').style.height = domHeight + 'px';
     }
diff --git a/hb_client/src/views/procurement/puorder.vue b/hb_client/src/views/procurement/puorder.vue
index bc77435..61c70da 100644
--- a/hb_client/src/views/procurement/puorder.vue
+++ b/hb_client/src/views/procurement/puorder.vue
@@ -44,7 +44,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{ bottomOffset: 43 }"
+        v-el-height-adaptive-table="{ bottomOffset: 50 }"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="采购订单编号" prop="number">
diff --git a/hb_client/src/views/procurement/vendor.vue b/hb_client/src/views/procurement/vendor.vue
index c3884aa..7186cc8 100644
--- a/hb_client/src/views/procurement/vendor.vue
+++ b/hb_client/src/views/procurement/vendor.vue
@@ -44,7 +44,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="供应商名" prop="name">
diff --git a/hb_client/src/views/qm/admissiontest.vue b/hb_client/src/views/qm/admissiontest.vue
index 86bc47a..078a5c5 100644
--- a/hb_client/src/views/qm/admissiontest.vue
+++ b/hb_client/src/views/qm/admissiontest.vue
@@ -10,7 +10,7 @@
             stripe
             highlight-current-row
             height="100"
-            v-el-height-adaptive-table="{bottomOffset: 42}"
+            v-el-height-adaptive-table="{bottomOffset: 50}"
           >
             <el-table-column type="index" width="50"/>
             <el-table-column label="物料批次">
diff --git a/hb_client/src/views/qm/processtest.vue b/hb_client/src/views/qm/processtest.vue
index a4f85eb..f2871fc 100644
--- a/hb_client/src/views/qm/processtest.vue
+++ b/hb_client/src/views/qm/processtest.vue
@@ -9,7 +9,7 @@
             fit
             stripe
             height="620"
-            v-el-height-adaptive-table="{ bottomOffset: 40 }"
+            v-el-height-adaptive-table="{ bottomOffset: 50 }"
           >
             <el-table-column type="index" width="50" />
             <el-table-column label="任务编号" align="center">
diff --git a/hb_client/src/views/qm/product.vue b/hb_client/src/views/qm/product.vue
index 1884153..9c2f66c 100644
--- a/hb_client/src/views/qm/product.vue
+++ b/hb_client/src/views/qm/product.vue
@@ -9,7 +9,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="成品编号" prop="number">
diff --git a/hb_client/src/views/qm/producttest.vue b/hb_client/src/views/qm/producttest.vue
index 2c25c36..03cfb05 100644
--- a/hb_client/src/views/qm/producttest.vue
+++ b/hb_client/src/views/qm/producttest.vue
@@ -8,7 +8,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" label="序号" width="50"/>
         <el-table-column label="产品编号">
diff --git a/hb_client/src/views/qm/unproduct.vue b/hb_client/src/views/qm/unproduct.vue
index f0736f7..a8a83e8 100644
--- a/hb_client/src/views/qm/unproduct.vue
+++ b/hb_client/src/views/qm/unproduct.vue
@@ -11,7 +11,7 @@
             stripe
             highlight-current-row
             height="100"
-            v-el-height-adaptive-table="{bottomOffset: 42}"
+            v-el-height-adaptive-table="{bottomOffset: 50}"
           >
             <el-table-column type="index" label="序号" width="50"/>
             <el-table-column label="产品编号">
diff --git a/hb_client/src/views/safeEnviro/Education.vue b/hb_client/src/views/safeEnviro/Education.vue
index fbaebbc..b682112 100644
--- a/hb_client/src/views/safeEnviro/Education.vue
+++ b/hb_client/src/views/safeEnviro/Education.vue
@@ -21,7 +21,7 @@
           stripe
           highlight-current-row
           height="100"
-          v-el-height-adaptive-table="{bottomOffset: 42}"
+          v-el-height-adaptive-table="{bottomOffset: 50}"
         >
           <el-table-column type="index" width="50"/>
           <el-table-column label="编号">
diff --git a/hb_client/src/views/safeEnviro/environmetManage.vue b/hb_client/src/views/safeEnviro/environmetManage.vue
index d4ef1a3..5adfb05 100644
--- a/hb_client/src/views/safeEnviro/environmetManage.vue
+++ b/hb_client/src/views/safeEnviro/environmetManage.vue
@@ -21,7 +21,7 @@
           stripe
           highlight-current-row
           height="100"
-          v-el-height-adaptive-table="{bottomOffset: 42}"
+          v-el-height-adaptive-table="{bottomOffset: 20}"
         >
           <el-table-column type="index" width="50"/>
           <el-table-column label="排放口">
diff --git a/hb_client/src/views/safeEnviro/intelligentAlarm.vue b/hb_client/src/views/safeEnviro/intelligentAlarm.vue
index 272892b..40a255d 100644
--- a/hb_client/src/views/safeEnviro/intelligentAlarm.vue
+++ b/hb_client/src/views/safeEnviro/intelligentAlarm.vue
@@ -21,7 +21,7 @@
           stripe
           highlight-current-row
           height="100"
-          v-el-height-adaptive-table="{bottomOffset: 42}"
+          v-el-height-adaptive-table="{bottomOffset: 50}"
         >
           <el-table-column type="index" width="50"/>
           <el-table-column label="事件种类" width="240" :show-overflow-tooltip="true">
@@ -31,10 +31,10 @@
               :key="item"
               type="warning"
               effect="plain"
-              >{{ item}}</el-tag
-            >
+              >{{ item}}
+            </el-tag>
           </template>
-        </el-table-column>
+          </el-table-column>
           <el-table-column label="发生区域" >
             <template slot-scope="scope">{{ scope.row.areaName }}</template>
           </el-table-column>
diff --git a/hb_client/src/views/safeEnviro/riskControl.vue b/hb_client/src/views/safeEnviro/riskControl.vue
index ebb1b89..d810271 100644
--- a/hb_client/src/views/safeEnviro/riskControl.vue
+++ b/hb_client/src/views/safeEnviro/riskControl.vue
@@ -20,7 +20,7 @@
           stripe
           highlight-current-row
           height="100"
-          v-el-height-adaptive-table="{bottomOffset: 42}"
+          v-el-height-adaptive-table="{bottomOffset: 50}"
         >
           <el-table-column type="index" width="50"/>
           <el-table-column label="区域">
diff --git a/hb_client/src/views/sam/contract.vue b/hb_client/src/views/sam/contract.vue
index 7fe2187..8d42b46 100644
--- a/hb_client/src/views/sam/contract.vue
+++ b/hb_client/src/views/sam/contract.vue
@@ -44,27 +44,27 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
-        <el-table-column label="合同名称" prop="name" width="160" show-overflow-tooltip>
+        <el-table-column label="合同名称" prop="name" min-width="160" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="合同编号" prop="number" width="160" show-overflow-tooltip>
+        <el-table-column label="合同编号" prop="number" min-width="160" show-overflow-tooltip>
         </el-table-column>
-          <el-table-column label="监管协议号" prop="watch_num" width="160" show-overflow-tooltip>
+          <el-table-column label="监管协议号" prop="watch_num" min-width="160" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="合同金额（元）" prop="amount" width="120">
+        <el-table-column label="合同金额（元）" prop="amount" min-width="120">
         </el-table-column>
-        <el-table-column label="开票金额（元）" prop="invoice" width="120">
+        <el-table-column label="开票金额（元）" prop="invoice" min-width="120">
         </el-table-column>
         <el-table-column label="客户名称" width="130" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.customer_.name }}</template>
         </el-table-column>
-        <el-table-column label="签订日期" prop="sign_date" width="120">
+        <el-table-column label="签订日期" prop="sign_date" min-width="120">
         </el-table-column>
-        <el-table-column label="描述" prop="description" width="130" show-overflow-tooltip>
+        <el-table-column label="描述" prop="description" min-width="130" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="创建时间" prop="create_time" width="160">
+        <el-table-column label="创建时间" prop="create_time" min-width="160">
         </el-table-column>
         <el-table-column
           align="center"
diff --git a/hb_client/src/views/sam/order.vue b/hb_client/src/views/sam/order.vue
index 7ed366a..4dbc084 100644
--- a/hb_client/src/views/sam/order.vue
+++ b/hb_client/src/views/sam/order.vue
@@ -44,36 +44,36 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{bottomOffset: 42}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
-        <el-table-column label="订单编号" prop="number" width="160" show-overflow-tooltip>
+        <el-table-column label="订单编号" prop="number" min-width="160" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="客户" width="200" show-overflow-tooltip>
+        <el-table-column label="客户" min-width="200" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.customer_.name }}</template>
         </el-table-column>
-        <el-table-column label="所属合同" width="200" show-overflow-tooltip>
+        <el-table-column label="所属合同" min-width="200" show-overflow-tooltip>
           <template slot-scope="scope" v-if="scope.row.contract">{{ scope.row.contract_.name }}</template>
         </el-table-column>
-        <el-table-column label="产品名称" width="200" show-overflow-tooltip>
+        <el-table-column label="产品名称" min-width="200" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.product_.name }}</template>
         </el-table-column>
-        <el-table-column label="产品型号" width="120" show-overflow-tooltip>
+        <el-table-column label="产品型号" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.product_.specification }}</template>
         </el-table-column>
-        <el-table-column label="产品数量" prop="count" width="90">
+        <el-table-column label="产品数量" prop="count" min-width="90">
         </el-table-column>
-        <el-table-column label="交货日期" prop="delivery_date" width="150">
+        <el-table-column label="交货日期" prop="delivery_date" min-width="150">
         </el-table-column>
-        <el-table-column label="已交货数量" prop="delivered_count" width="150">
+        <el-table-column label="已交货数量" prop="delivered_count" min-width="100">
         </el-table-column>
-        <el-table-column label="是否需要军检" width="150">
+        <el-table-column label="是否需要军检" min-width="100">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.need_mtest === false">否</el-tag>
             <el-tag v-else-if="scope.row.need_mtest === true">是</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" width="160">
+        <el-table-column label="创建时间" min-width="160">
           <template slot-scope="scope">{{ scope.row.create_time }}</template>
         </el-table-column>
         <el-table-column
diff --git a/hb_client/src/views/sam/sales.vue b/hb_client/src/views/sam/sales.vue
index 973c6dc..fc12d12 100644
--- a/hb_client/src/views/sam/sales.vue
+++ b/hb_client/src/views/sam/sales.vue
@@ -43,7 +43,7 @@
         stripe
         highlight-current-row
         height="100"
-        v-el-height-adaptive-table="{ bottomOffset: 42 }"
+        v-el-height-adaptive-table="{ bottomOffset: 50 }"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="产品名称" show-overflow-tooltip>
diff --git a/hb_client/src/views/statistics/materialStatistics.vue b/hb_client/src/views/statistics/materialStatistics.vue
index aeadea4..88a6f84 100644
--- a/hb_client/src/views/statistics/materialStatistics.vue
+++ b/hb_client/src/views/statistics/materialStatistics.vue
@@ -37,7 +37,7 @@
             pager-count="3"
             style="border-top: 1px solid #f5f5f5;"
             height="100"
-            v-el-height-adaptive-table="{bottomOffset: 20}"
+            v-el-height-adaptive-table="{bottomOffset: 30}"
           >
             <el-table-column label="序号" type="index">
             </el-table-column>
@@ -94,7 +94,7 @@
               pager-count="3"
               style="border-top: 1px solid #f5f5f5;"
               height="100"
-              v-el-height-adaptive-table="{bottomOffset: 20}"
+              v-el-height-adaptive-table="{bottomOffset: 30}"
             >
               <el-table-column label="序号" type="index" width="50">
               </el-table-column>
@@ -132,7 +132,7 @@
               pager-count="3"
               style="border-top: 1px solid #f5f5f5;"
               height="100"
-              v-el-height-adaptive-table="{bottomOffset: 20}"
+              v-el-height-adaptive-table="{bottomOffset: 30}"
             >
               <el-table-column label="序号" type="index">
               </el-table-column>
diff --git a/hb_client/src/views/statistics/personStatistics.vue b/hb_client/src/views/statistics/personStatistics.vue
index a608e05..3b6c6cd 100644
--- a/hb_client/src/views/statistics/personStatistics.vue
+++ b/hb_client/src/views/statistics/personStatistics.vue
@@ -35,7 +35,7 @@
         height="100"
         stripe
         border
-        v-el-height-adaptive-table="{bottomOffset: 41}"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column align="center" label="工号">
diff --git a/hb_client/src/views/statistics/progressStatistics.vue b/hb_client/src/views/statistics/progressStatistics.vue
index 8afeeb4..7278e31 100644
--- a/hb_client/src/views/statistics/progressStatistics.vue
+++ b/hb_client/src/views/statistics/progressStatistics.vue
@@ -51,7 +51,7 @@
             size="mini"
             highlight-current-row
             height="100"
-            v-el-height-adaptive-table="{bottomOffset: 42}"
+            v-el-height-adaptive-table="{bottomOffset: 50}"
           >
             <el-table-column type="index" width="50" />
             <el-table-column label="订单编号"  width="120" show-overflow-tooltip>
@@ -91,7 +91,7 @@
             size="mini"
             highlight-current-row
             height="100"
-            v-el-height-adaptive-table="{bottomOffset: 42}"
+            v-el-height-adaptive-table="{bottomOffset: 50}"
           >
             <el-table-column type="index" width="50" />
             <el-table-column label="任务编号" prop="number" show-overflow-tooltip>
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index e637c94..2859cc3 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -34,7 +34,7 @@
             stripe
             height="100"
             highlight-current-row
-            v-el-height-adaptive-table="{bottomOffset: 50}"
+            v-el-height-adaptive-table="{bottomOffset: 60}"
           >
             <el-table-column type="index" width="50"/>
             <el-table-column label="半成品名称">
diff --git a/hb_client/src/views/wpm/operation.vue b/hb_client/src/views/wpm/operation.vue
index 12dcebc..b221dc8 100644
--- a/hb_client/src/views/wpm/operation.vue
+++ b/hb_client/src/views/wpm/operation.vue
@@ -21,7 +21,7 @@
             style="width: 100%"
             height="100"
             highlight-current-row
-            v-el-height-adaptive-table="{bottomOffset: 50}"
+            v-el-height-adaptive-table="{bottomOffset: 60}"
           >
             <el-table-column type="index" width="50"/>
             <el-table-column label="任务编号">
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index a304125..a4b7ad2 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -1202,7 +1202,7 @@
     },
     mounted() {
       let H = document.getElementsByClassName('app-main')[0].clientHeight;
-      let h = H/2-85;
+      let h = H/2-93;
       this.tableHeight = h+'px';
       this.secondTableHeight = h-36+'px';
     }