From 3667b98da96f7f56d0c4a379d1233e6a22266c5a Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Thu, 16 Nov 2023 13:57:21 +0800 Subject: [PATCH 1/3] bug --- .env.dev | 6 +++--- src/views/base/coreProductionLine/index.vue | 5 +++-- src/views/base/coreWorkOrder/allocation.vue | 6 +++--- src/views/base/coreWorkOrder/detail.vue | 17 +++++++++-------- src/views/base/coreWorkOrder/index.vue | 9 +++++++-- src/views/core/analysis/yieldAnalysis/index.vue | 2 +- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.env.dev b/.env.dev index 53f0527b..bb552534 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-11-15 17:25:58 + # @LastEditTime: 2023-11-16 13:49:36 # @LastEditors: DY # @Description: ### @@ -13,13 +13,13 @@ VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://100.64.0.26:48082' -VUE_APP_BASE_API = 'http://192.168.0.33:48082' +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.4.173:48080' # VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48080' # VUE_APP_BASE_API = 'http://192.168.0.33:48082' -# VUE_APP_BASE_API = 'http://192.168.1.56:48080' +VUE_APP_BASE_API = 'http://192.168.1.56:48080' # VUE_APP_BASE_API = 'http://192.168.4.159:48080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/views/base/coreProductionLine/index.vue b/src/views/base/coreProductionLine/index.vue index 215cf41c..816ae787 100644 --- a/src/views/base/coreProductionLine/index.vue +++ b/src/views/base/coreProductionLine/index.vue @@ -140,8 +140,8 @@ export default { getDataList() { this.dataListLoading = true; this.urlOptions.getDataListURL(this.listQuery).then(response => { - // this.tableData = response.data.list; - this.getStatus(response.data.list) + this.tableData = response.data.list; + // this.getStatus(response.data.list) this.listQuery.total = response.data.total; this.dataListLoading = false; }); @@ -150,6 +150,7 @@ export default { const ids = list.map((i) => { return i.id; }); + console.log('111', ids) getStatus(ids).then((response) => { response.forEach((a) => { list.forEach((b) => { diff --git a/src/views/base/coreWorkOrder/allocation.vue b/src/views/base/coreWorkOrder/allocation.vue index f9e45b1a..24f3f5cc 100644 --- a/src/views/base/coreWorkOrder/allocation.vue +++ b/src/views/base/coreWorkOrder/allocation.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: DY - * @LastEditTime: 2023-11-15 17:45:04 + * @LastEditTime: 2023-11-16 09:14:35 * @Description: -->