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 @@ {{ parseTime(row.credatuz) }} + + + + 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 @@ + v-loading="loading" + :align="allAlign" + :data="dataList" + show-overflow + resizable + border + highlight-hover-row + :cell-style="columnStyle" + > @@ -90,6 +91,10 @@ + + + +