From 2a0d422d844f8f0eef0e186cc6584d3412e225dc Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 29 Oct 2019 16:47:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=B7=A5=E6=97=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/ActualWorkQuery/index.vue     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
index 1d13d56f..e9fa7258 100644
--- a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
+++ b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
@@ -13,13 +13,13 @@
           placeholder="选择日期"
           @change="pageCurrent=1;total=0;searchTable()"/>
         <span>操作者:</span>
-        <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px; margin-top: 10px;margin-bottom: 10px"/>
+        <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:100px; margin-top: 10px;margin-bottom: 10px"/>
         <el-button :disabled="loading" type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
       </el-row>
     </el-card>
 
     <el-card>
-      <el-table v-loading="loading" :data="tableData" stripe height="700" size="mini" style="width: 1050px;" border>
+      <el-table v-loading="loading" :data="tableData" stripe height="700" size="mini" style="width: 1100px;" border>
         <el-table-column label="序号" type="index" align="center" width="55"/>
         <el-table-column label="操作者" prop="姓名" align="center" width="80px">
           <template slot-scope="scope">
@@ -46,14 +46,14 @@
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="实际工时" align="center" width="70px">
+        <el-table-column label="实际工时" align="center" width="100px">
           <template slot-scope="scope">
             {{ scope.row.实际加工时间段 || '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="计划工时" prop="理论加工时间段" align="center" width="90px">
+        <el-table-column label="计划工时" prop="理论加工时间段" align="center" width="100px">
           <template slot-scope="scope">
-            {{ isShow ? scope.row.理论加工时间段 : '-' }}
+            {{ scope.row.理论加工时间段 }}
           </template>
         </el-table-column>
         <el-table-column label="实际开始时间" align="center" width="160px">
@@ -91,7 +91,6 @@ export default {
   name: 'ActualTimeSupplement',
   data() {
     return {
-      isShow: false,
       startTime: getNowShotTime(),
       workerName: '',
       loading: false,

From e07b9b66f9ed2393c7b5ee6e1fe39a4858fe7972 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 29 Oct 2019 16:49:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E6=97=B6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ManufacturingCenter/ManHourStatistics/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
index e021abbc..656e5dd4 100644
--- a/src/views/ManufacturingCenter/ManHourStatistics/index.vue
+++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
@@ -21,8 +21,8 @@
         <el-button type="primary" size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportTable()">导出</el-button>
       </el-tooltip>
     </el-card>
-    <el-card>
-      <el-table v-loading="loading" :data="tableData" size="mini" stripe style="width: 700px" border element-loading-text="拼命加载中">
+    <el-card style="width: 500px">
+      <el-table v-loading="loading" :data="tableData" size="mini" stripe style="width: 500px" border element-loading-text="拼命加载中">
         <el-table-column label="操作者" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}

From 5dc659c34fa69d9f3fb83f19a774937b888bfdf7 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 29 Oct 2019 16:52:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/ActualWorkQuery/index.vue      |  4 ++--
 .../ManufacturingCenter/ManHourStatistics/index.vue    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
index e9fa7258..fe0bbb90 100644
--- a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
+++ b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card>
+    <el-card style="width: 1100px;">
       <el-row>
         <span class="demonstration">日期:</span>
         <el-date-picker
@@ -18,7 +18,7 @@
       </el-row>
     </el-card>
 
-    <el-card>
+    <el-card style="width: 1100px;">
       <el-table v-loading="loading" :data="tableData" stripe height="700" size="mini" style="width: 1100px;" border>
         <el-table-column label="序号" type="index" align="center" width="55"/>
         <el-table-column label="操作者" prop="姓名" align="center" width="80px">
diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
index 656e5dd4..33b6167d 100644
--- a/src/views/ManufacturingCenter/ManHourStatistics/index.vue
+++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card>
+    <el-card style="width: 585px;">
       <el-date-picker
         v-model="startTime"
         value-format="yyyy-MM-dd"
@@ -16,13 +16,13 @@
         style="width: 170px;margin:0px 10px"
         type="date"
         placeholder="选择结束日期"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="searchTable();">查询</el-button>
+      <el-button type="success" class="el-icon-search" size="small" @click="searchTable();">查询</el-button>
       <el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
-        <el-button type="primary" size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportTable()">导出</el-button>
+        <el-button type="primary" size="small" icon="el-icon-download" @click="exportTable()">导出</el-button>
       </el-tooltip>
     </el-card>
-    <el-card style="width: 500px">
-      <el-table v-loading="loading" :data="tableData" size="mini" stripe style="width: 500px" border element-loading-text="拼命加载中">
+    <el-card style="width: 585px">
+      <el-table v-loading="loading" :data="tableData" size="mini" stripe style="width: 585px" border element-loading-text="拼命加载中">
         <el-table-column label="操作者" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}