From a83ac1224a764fde8d30857022593fdeabefe02a Mon Sep 17 00:00:00 2001
From: liwei <wei.li@le-it.com.cn>
Date: Wed, 28 Jul 2021 13:46:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                        |  6 ++++--
 src/views/equip/reportform/history.vue |  4 ++++
 src/views/equip/workbench/order.vue    | 21 +++++++++++++--------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/.env.production b/.env.production
index 09c29f6..7561b5b 100644
--- a/.env.production
+++ b/.env.production
@@ -2,5 +2,7 @@
 VUE_APP_ENV = 'Prod'
 NODE_ENV = 'production'
 # base api
-# VUE_APP_BASE_API = 'http://10.122.64.86:8095'
-VUE_APP_BASE_API = 'http://192.168.3.22:8095'
+# 正式版本
+VUE_APP_BASE_API = 'http://10.122.64.86:8095'
+# 测试版本
+#VUE_APP_BASE_API = 'http://192.168.3.22:8095'
diff --git a/src/views/equip/reportform/history.vue b/src/views/equip/reportform/history.vue
index ea4b38b..8e3a8b5 100644
--- a/src/views/equip/reportform/history.vue
+++ b/src/views/equip/reportform/history.vue
@@ -135,6 +135,10 @@
                 <span> {{ parseTime(row.credatuz) }} </span>
               </template>
             </vxe-table-column>
+            <!-- 实际开始时间 -->
+            <vxe-table-column field="actbegtime" width="200" :title="getColumnName('actbegtime')" />
+            <!-- 实际结束时间 -->
+            <vxe-table-column field="actendtime" width="200" :title="getColumnName('actendtime')" />
           </vxe-table>
         </template>
       </vxe-table-column>
diff --git a/src/views/equip/workbench/order.vue b/src/views/equip/workbench/order.vue
index 8bc16d4..f63a7f2 100644
--- a/src/views/equip/workbench/order.vue
+++ b/src/views/equip/workbench/order.vue
@@ -50,14 +50,15 @@
     </el-form>
 		<!-- 列表 -->
     <vxe-table ref="xTable"
-               v-loading="loading"
-               :align="allAlign"
-               :data="dataList"
-               show-overflow
-               resizable
-               border
-               highlight-hover-row
-               :cell-style="columnStyle">
+      v-loading="loading"
+      :align="allAlign"
+      :data="dataList"
+      show-overflow
+      resizable
+      border
+      highlight-hover-row
+      :cell-style="columnStyle"
+    >
 			<!-- 维护工单 -->
       <vxe-table-column field="maintwoid" width="150" show-overflow :title="getColumnName('maintwoid')" />
 			<!-- 描述 -->
@@ -90,6 +91,10 @@
       </vxe-table-column>
 			<!-- 最近一次更改人 -->
       <vxe-table-column field="lastuser" width="200" :title="getColumnName('lastuser')" />
+      <!-- 实际开始时间 -->
+      <vxe-table-column field="actbegtime" width="200" :title="getColumnName('actbegtime')" />
+      <!-- 实际结束时间 -->
+      <vxe-table-column field="actendtime" width="200" :title="getColumnName('actendtime')" />
 			<!-- 创建时间 -->
       <vxe-table-column field="credatuz" width="200" :title="getColumnName('credatuz')">
         <template slot-scope="scope">