From 2d49bfe10ebf50b7870bd62931f3875c8ecbf0d9 Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Mon, 17 Jun 2024 09:00:07 +0800 Subject: [PATCH] bug --- .env.dev | 8 +- src/assets/icons/svg/factoryWorkOrder.svg | 17 +++ src/assets/icons/svg/workProcess.svg | 15 ++ src/views/produce/target/add-or-updata.vue | 10 +- src/views/produce/target/detail-or-updata.vue | 136 ++---------------- src/views/produce/workOrder/add-or-updata.vue | 9 +- src/views/produce/workOrder/index.vue | 108 ++++++++++---- 7 files changed, 142 insertions(+), 161 deletions(-) create mode 100644 src/assets/icons/svg/factoryWorkOrder.svg create mode 100644 src/assets/icons/svg/workProcess.svg diff --git a/.env.dev b/.env.dev index 1f48230..e077e07 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: zhp # @Date: 2024-04-28 13:42:51 - # @LastEditTime: 2024-06-07 10:32:24 + # @LastEditTime: 2024-06-14 08:56:41 # @LastEditors: DY # @Description: ### @@ -13,9 +13,11 @@ VUE_APP_TITLE = 发电玻璃智能管控平台 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://192.168.1.70:30307' -# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com' +VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com' +# 郭 +# VUE_APP_BASE_API = 'http://192.168.1.61:48080' # sara -VUE_APP_BASE_API = 'http://192.168.1.63:48080' +# VUE_APP_BASE_API = 'http://192.168.1.63:48080' # 张一丁 # VUE_APP_BASE_API = 'http://192.168.4.139:48080' diff --git a/src/assets/icons/svg/factoryWorkOrder.svg b/src/assets/icons/svg/factoryWorkOrder.svg new file mode 100644 index 0000000..7708508 --- /dev/null +++ b/src/assets/icons/svg/factoryWorkOrder.svg @@ -0,0 +1,17 @@ + + + 编组 15 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/workProcess.svg b/src/assets/icons/svg/workProcess.svg new file mode 100644 index 0000000..a168a40 --- /dev/null +++ b/src/assets/icons/svg/workProcess.svg @@ -0,0 +1,15 @@ + + + 编组 13 + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/produce/target/add-or-updata.vue b/src/views/produce/target/add-or-updata.vue index 22b01c2..34ab3ac 100644 --- a/src/views/produce/target/add-or-updata.vue +++ b/src/views/produce/target/add-or-updata.vue @@ -1,7 +1,7 @@ @@ -170,6 +170,11 @@ + + + + + @@ -293,7 +298,8 @@ export default { bipvInsideMaterialCost: undefined, bipvOeeMaterialCost: undefined, bipvComprehensiveMaterialCost: undefined, - molybdenumElectrodeInput: undefined + molybdenumElectrodeInput: undefined, + componentConversionEfficiency: undefined }, // materialList: [], dataRule: { diff --git a/src/views/produce/target/detail-or-updata.vue b/src/views/produce/target/detail-or-updata.vue index 954b98b..0bebb21 100644 --- a/src/views/produce/target/detail-or-updata.vue +++ b/src/views/produce/target/detail-or-updata.vue @@ -1,14 +1,15 @@