diff --git a/.env.production b/.env.production
index 09c29f6..92e7273 100644
--- a/.env.production
+++ b/.env.production
@@ -2,5 +2,5 @@
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'
diff --git a/src/views/equip/basic/service.vue b/src/views/equip/basic/service.vue
index 15a3012..05cbad6 100644
--- a/src/views/equip/basic/service.vue
+++ b/src/views/equip/basic/service.vue
@@ -170,7 +170,7 @@
-
+
diff --git a/src/views/equip/reportform/history.vue b/src/views/equip/reportform/history.vue
index ea4b38b..e0c81a7 100644
--- a/src/views/equip/reportform/history.vue
+++ b/src/views/equip/reportform/history.vue
@@ -135,6 +135,7 @@
{{ parseTime(row.credatuz) }}
+
@@ -154,6 +155,18 @@
{{ parseTime(scope.row.schedendtime) }}
+
+
+
+ {{ parseTime(scope.row.actbegtime) }}
+
+
+
+
+
+ {{ parseTime(scope.row.actendtime) }}
+
+
diff --git a/src/views/equip/workbench/order.vue b/src/views/equip/workbench/order.vue
index e0115e4..4db49e1 100644
--- a/src/views/equip/workbench/order.vue
+++ b/src/views/equip/workbench/order.vue
@@ -50,14 +50,15 @@
+ v-loading="loading"
+ :align="allAlign"
+ :data="dataList"
+ show-overflow
+ resizable
+ border
+ highlight-hover-row
+ :cell-style="columnStyle"
+ >
@@ -87,9 +88,22 @@
{{ parseTime(scope.row.schedendtime) }}
+
+
+
+
+ {{ parseTime(scope.row.actbegtime) }}
+
+
+
+
+
+ {{ parseTime(scope.row.actendtime) }}
+
+