From 5a08d8c1dd0802f1afa18a100e45e87eba905cd6 Mon Sep 17 00:00:00 2001 From: g7hoo Date: Sun, 9 Oct 2022 10:36:18 +0800 Subject: [PATCH] fix some bugs --- .../base-dialog/addOrUpdate/index.vue | 9 +-- src/views/main-navbar.vue | 79 ++++++------------- .../modules/job/schedule-add-or-update.vue | 6 ++ src/views/modules/job/schedule-log.vue | 6 ++ src/views/modules/job/schedule.vue | 6 ++ src/views/modules/monitoring/equipment.vue | 15 +++- .../modules/monitoring/equipmentAlarmLog.vue | 6 ++ .../monitoring/equipmentCurrentState.vue | 8 +- .../modules/monitoring/equipmentFile.vue | 6 ++ .../modules/monitoring/equipmentGroup.vue | 8 +- .../monitoring/equipmentGroupAlarm.vue | 8 +- .../equipmentHistoricalParameters.vue | 6 ++ src/views/modules/monitoring/equipmentPlc.vue | 8 +- .../monitoring/equipmentPlcConnect.vue | 8 +- .../modules/monitoring/equipmentPlcParam.vue | 6 ++ .../modules/monitoring/equipmentQuantity.vue | 6 ++ .../modules/monitoring/equipmentStatusLog.vue | 6 ++ .../modules/monitoring/equipmentType.vue | 8 +- .../modules/monitoring/equipmentTypeFile.vue | 6 ++ .../modules/monitoring/equipmentattr.vue | 6 ++ src/views/modules/monitoring/factory.vue | 8 +- src/views/modules/monitoring/product.vue | 19 ++++- src/views/modules/monitoring/productArrt.vue | 8 +- .../modules/monitoring/productionLine.vue | 8 +- .../monitoring/productionLineRecSch.vue | 6 ++ .../monitoring/qualityInspectionDet.vue | 12 ++- .../monitoring/qualityInspectionRecord.vue | 8 +- .../monitoring/qualityInspectionType.vue | 26 +++++- .../modules/monitoring/reportCategory.vue | 8 +- src/views/modules/monitoring/reportDetail.vue | 14 +++- .../monitoring/reportSheet-add-or-update.vue | 2 +- src/views/modules/monitoring/reportSheet.vue | 6 ++ .../reportSheetCategory-add-or-update.vue | 2 +- .../monitoring/reportSheetCategory.vue | 6 ++ src/views/modules/monitoring/sysfile.vue | 6 ++ src/views/modules/monitoring/sysfileType.vue | 6 ++ .../modules/monitoring/workShopSection.vue | 8 +- .../monitoring/workShopSectionEquipment.vue | 6 ++ .../monitoring/workshopSectionDialog.vue | 2 +- src/views/modules/oss/oss-config.vue | 6 ++ src/views/modules/oss/oss-upload.vue | 6 ++ src/views/modules/oss/oss.vue | 6 ++ src/views/modules/sys/dept-add-or-update.vue | 6 ++ .../modules/sys/dict-data-add-or-update.vue | 6 ++ src/views/modules/sys/dict-data.vue | 6 ++ .../modules/sys/dict-type-add-or-update.vue | 6 ++ src/views/modules/sys/dict-type.vue | 6 ++ src/views/modules/sys/log-error.vue | 6 ++ src/views/modules/sys/menu-add-or-update.vue | 6 ++ .../modules/sys/params-add-or-update.vue | 6 ++ src/views/modules/sys/role-add-or-update.vue | 6 ++ src/views/modules/sys/user-add-or-update.vue | 6 ++ src/views/pages/login.vue | 6 +- 53 files changed, 367 insertions(+), 95 deletions(-) diff --git a/src/components/base-dialog/addOrUpdate/index.vue b/src/components/base-dialog/addOrUpdate/index.vue index 3c71bd9..4663338 100644 --- a/src/components/base-dialog/addOrUpdate/index.vue +++ b/src/components/base-dialog/addOrUpdate/index.vue @@ -147,13 +147,6 @@ export default { components: { AttrForm }, props: { configs: { - /** - * TODO: 定义及使用方式,应改用README.md文件记录 - * type: 'dialog' | 'drawer' | 'page' - * fields: Array - * - fields.object: { name, type: 'number'|'textarea'|'select'|'date'|.., required: boolean, validator: boolean(是否需要验证), [options]: any[], api: string(自动获取数据的接口,一般为getcode接口)} - * operations: Array[object], 操作名和对应的接口地址,还有permission(如,sys:dict:update) - */ type: Object, default: () => ({}) // 此处省去类型检查,使用者自行注意就好 } @@ -533,7 +526,7 @@ export default { } break case 'cancel': - this.visible = false + this.handleClose() // add more.. } }, diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 7215699..442f231 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -1,36 +1,20 @@