From 974987643ce9a63eb293d1410319b353598d5557 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 10 Oct 2019 12:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=AA=E5=90=91=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Inventory/PurchasePartsStorage/index.vue          | 3 +++
 src/views/ManufacturingCenter/EquipmentMonitoring/index.vue | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue
index 91ad8480..6458505e 100644
--- a/src/views/Inventory/PurchasePartsStorage/index.vue
+++ b/src/views/Inventory/PurchasePartsStorage/index.vue
@@ -121,6 +121,9 @@
       </el-form>
       <el-button type="primary" style="margin-bottom: 40px;width:100%" @click="inBound">确定入库</el-button>
     </div>
+    <el-table :data="tableData" border highlight-current-row style="width: 100%;margin-top:20px;">
+      <el-table-column v-for="item of tableHeader" :key="item" :prop="item" :label="item" />
+    </el-table>
   </div>
 </template>
 
diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
index 3d1960d2..64c91864 100644
--- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card>
+  <el-card class="cardSBJK">
     <div class="process">
       <el-tooltip :enterable="false" :id="OPNAME137" placement="top" @mouseover.native.prevent="changeActive($event)">
         <div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
@@ -862,6 +862,9 @@ export default {
 </script>
 
 <style scoped>
+  .cardSBJK{
+    overflow: auto;
+  }
   .process{
     text-align: center;
     margin-left: 0px;