From 69bdab75d4119229169cb1d03f03c1bbeff8911e Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Tue, 10 Oct 2023 17:06:39 +0800 Subject: [PATCH] bug --- .../base/equipmentBindSection/dialogForm.vue | 4 +++- src/views/base/equipmentBindSection/index.vue | 20 ++++++++++++++++- src/views/core/base/lineBindProduct/index.vue | 5 +++-- .../base/lineBindProduct/selectProduct.vue | 7 ++++-- src/views/core/monitoring/auto/index.vue | 6 ++--- src/views/core/monitoring/data/index.vue | 22 ++++++++++++++----- src/views/core/monitoring/data24/index.vue | 4 +++- .../sectionStatisticsSearch/index.vue | 16 ++++++++++++-- 8 files changed, 67 insertions(+), 17 deletions(-) diff --git a/src/views/base/equipmentBindSection/dialogForm.vue b/src/views/base/equipmentBindSection/dialogForm.vue index 6fd786ce..ce6ff70c 100644 --- a/src/views/base/equipmentBindSection/dialogForm.vue +++ b/src/views/base/equipmentBindSection/dialogForm.vue @@ -72,9 +72,11 @@ - diff --git a/src/views/base/equipmentBindSection/index.vue b/src/views/base/equipmentBindSection/index.vue index 405c7393..f0c2238f 100644 --- a/src/views/base/equipmentBindSection/index.vue +++ b/src/views/base/equipmentBindSection/index.vue @@ -134,6 +134,8 @@ export default { label: '工段', placeholder: '请选择工段', param: 'workshopSectionId', + selectOptions: [], + filterable: true }, { type: 'input', @@ -239,8 +241,24 @@ export default { }, created() { this.getList(); + this.initWorksection(); }, methods: { + /** 准备工段数据 */ + async initWorksection() { + const { code, data } = await this.$axios({ + url: '/base/workshop-section/listAll', + method: 'get', + }); + if (code == 0) { + this.searchBarFormConfig[0].selectOptions = data.map((item) => { + return { + name: item.name, + id: item.id, + }; + }); + } + }, /** 查询列表 */ getList() { this.loading = true; @@ -323,7 +341,7 @@ export default { handleDelete(row) { const id = row.id; this.$modal - .confirm('是否确认删除工段设备绑定编号为"' + id + '"的数据项?') + .confirm('是否确认删除工段设备绑定设备名称为"' + row.equipment + '"的数据项?') .then(function () { return deleteEquipmentBindSection(id); }) diff --git a/src/views/core/base/lineBindProduct/index.vue b/src/views/core/base/lineBindProduct/index.vue index f77b8eba..1fc31501 100644 --- a/src/views/core/base/lineBindProduct/index.vue +++ b/src/views/core/base/lineBindProduct/index.vue @@ -1,8 +1,8 @@