From 6e06159250f74959a438b3080eec3811255a28ca Mon Sep 17 00:00:00 2001 From: g7hoo Date: Thu, 1 Sep 2022 08:50:46 +0800 Subject: [PATCH] update calcTableHeight --- .../modules/monitoring/equipmentAlarmLog.vue | 13 ++++-- .../modules/monitoring/equipmentFile.vue | 2 +- .../modules/monitoring/equipmentGroup.vue | 1 + .../monitoring/equipmentGroupAlarm.vue | 1 + src/views/modules/monitoring/equipmentPlc.vue | 1 + .../monitoring/equipmentPlcConnect.vue | 1 + .../modules/monitoring/equipmentPlcParam.vue | 1 + .../modules/monitoring/equipmentQuantity.vue | 1 + .../modules/monitoring/equipmentStatusLog.vue | 1 + .../modules/monitoring/equipmentType.vue | 1 + .../modules/monitoring/equipmentTypeFile.vue | 1 + .../modules/monitoring/equipmentattr.vue | 46 +++++-------------- src/views/modules/monitoring/factory.vue | 1 + src/views/modules/monitoring/product.vue | 1 + src/views/modules/monitoring/productArrt.vue | 1 + .../modules/monitoring/productionLine.vue | 1 + .../monitoring/productionLineRecSch.vue | 1 + .../monitoring/qualityInspectionCurrent.vue | 1 + .../monitoring/qualityInspectionDet.vue | 1 + .../monitoring/qualityInspectionRecord.vue | 1 + .../monitoring/qualityInspectionType.vue | 1 + .../modules/monitoring/realtimeEquipment.vue | 1 + .../monitoring/realtimeProductLine.vue | 1 + .../monitoring/realtimeQualityInspection.vue | 15 +++--- .../modules/monitoring/reportCategory.vue | 1 + src/views/modules/monitoring/reportDetail.vue | 4 +- src/views/modules/monitoring/reportList.vue | 8 +--- src/views/modules/monitoring/reportSheet.vue | 1 + .../monitoring/reportSheetCategory.vue | 1 + src/views/modules/monitoring/sysfile.vue | 1 + src/views/modules/monitoring/sysfileType.vue | 1 + .../modules/monitoring/workShopSection.vue | 1 + .../monitoring/workShopSectionEquipment.vue | 1 + 33 files changed, 57 insertions(+), 58 deletions(-) diff --git a/src/views/modules/monitoring/equipmentAlarmLog.vue b/src/views/modules/monitoring/equipmentAlarmLog.vue index f38f1c4..bbe63ab 100644 --- a/src/views/modules/monitoring/equipmentAlarmLog.vue +++ b/src/views/modules/monitoring/equipmentAlarmLog.vue @@ -7,7 +7,6 @@ 查询 新增 - - + 查询 新增 - - + - + @@ -103,6 +82,7 @@ export default { data() { return { tableConfigs, + calcMaxHeight, dataForm: { key: '' }, @@ -174,15 +154,11 @@ export default { : this.dataListSelections.map(item => { return item.id }) - this.$confirm( - `确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, - '提示', - { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { + this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { this.$http({ url: this.$http.adornUrl('/monitoring/equipmentAttr'), method: 'delete', diff --git a/src/views/modules/monitoring/factory.vue b/src/views/modules/monitoring/factory.vue index 29d9aa6..1b66073 100644 --- a/src/views/modules/monitoring/factory.vue +++ b/src/views/modules/monitoring/factory.vue @@ -70,6 +70,7 @@ const addOrUpdateConfigs = { export default { data() { return { + calcMaxHeight, addOrUpdateConfigs, tableConfigs, dataForm: { diff --git a/src/views/modules/monitoring/product.vue b/src/views/modules/monitoring/product.vue index 48037a8..705925e 100644 --- a/src/views/modules/monitoring/product.vue +++ b/src/views/modules/monitoring/product.vue @@ -127,6 +127,7 @@ export default { mixins: [dictListMixin], data() { return { + calcMaxHeight, tableConfigs, dataForm: { key: '' diff --git a/src/views/modules/monitoring/productArrt.vue b/src/views/modules/monitoring/productArrt.vue index 135812c..81f59b8 100644 --- a/src/views/modules/monitoring/productArrt.vue +++ b/src/views/modules/monitoring/productArrt.vue @@ -110,6 +110,7 @@ const addOrUpdateConfigs = { export default { data() { return { + calcMaxHeight, addOrUpdateConfigs, tableConfigs, dataForm: { diff --git a/src/views/modules/monitoring/productionLine.vue b/src/views/modules/monitoring/productionLine.vue index 79edff1..fd75863 100644 --- a/src/views/modules/monitoring/productionLine.vue +++ b/src/views/modules/monitoring/productionLine.vue @@ -78,6 +78,7 @@ const addOrUpdateConfigs = { export default { data() { return { + calcMaxHeight, addOrUpdateConfigs, tableConfigs, dataForm: { diff --git a/src/views/modules/monitoring/productionLineRecSch.vue b/src/views/modules/monitoring/productionLineRecSch.vue index f81696d..f90464f 100644 --- a/src/views/modules/monitoring/productionLineRecSch.vue +++ b/src/views/modules/monitoring/productionLineRecSch.vue @@ -64,6 +64,7 @@ const tableConfigs = [ export default { data() { return { + calcMaxHeight, tableConfigs, dataForm: { key: '' diff --git a/src/views/modules/monitoring/qualityInspectionCurrent.vue b/src/views/modules/monitoring/qualityInspectionCurrent.vue index 577edba..162916e 100644 --- a/src/views/modules/monitoring/qualityInspectionCurrent.vue +++ b/src/views/modules/monitoring/qualityInspectionCurrent.vue @@ -99,6 +99,7 @@ const FakeChart = { }, data() { return { + calcMaxHeight, chart: null, defaultOpts: { title: { diff --git a/src/views/modules/monitoring/qualityInspectionDet.vue b/src/views/modules/monitoring/qualityInspectionDet.vue index 92ac3ea..031fe95 100644 --- a/src/views/modules/monitoring/qualityInspectionDet.vue +++ b/src/views/modules/monitoring/qualityInspectionDet.vue @@ -62,6 +62,7 @@ const addOrUpdateConfigs = { export default { data() { return { + calcMaxHeight, addOrUpdateConfigs, tableConfigs, dataForm: { diff --git a/src/views/modules/monitoring/qualityInspectionRecord.vue b/src/views/modules/monitoring/qualityInspectionRecord.vue index 98dc351..7ac7a19 100644 --- a/src/views/modules/monitoring/qualityInspectionRecord.vue +++ b/src/views/modules/monitoring/qualityInspectionRecord.vue @@ -93,6 +93,7 @@ const addOrUpdateConfigs = { export default { data() { return { + calcMaxHeight, addOrUpdateConfigs, tableConfigs, dataForm: { diff --git a/src/views/modules/monitoring/qualityInspectionType.vue b/src/views/modules/monitoring/qualityInspectionType.vue index 8bdb048..722538f 100644 --- a/src/views/modules/monitoring/qualityInspectionType.vue +++ b/src/views/modules/monitoring/qualityInspectionType.vue @@ -55,6 +55,7 @@ const addOrUpdateConfigs = { export default { data() { return { + calcMaxHeight, addOrUpdateConfigs, tableConfigs, dataForm: { diff --git a/src/views/modules/monitoring/realtimeEquipment.vue b/src/views/modules/monitoring/realtimeEquipment.vue index 0025c46..bf94e3b 100644 --- a/src/views/modules/monitoring/realtimeEquipment.vue +++ b/src/views/modules/monitoring/realtimeEquipment.vue @@ -24,6 +24,7 @@ export default { components: { BaseTable, SmallTitle }, data() { return { + calcMaxHeight, loadTable: false, tableProps: [{ label: 'default', prop: 'default' }], stepOneArray: [], diff --git a/src/views/modules/monitoring/realtimeProductLine.vue b/src/views/modules/monitoring/realtimeProductLine.vue index 2cdf64f..b08f20a 100644 --- a/src/views/modules/monitoring/realtimeProductLine.vue +++ b/src/views/modules/monitoring/realtimeProductLine.vue @@ -24,6 +24,7 @@ export default { components: { BaseTable, SmallTitle }, data() { return { + calcMaxHeight, loadTable: false, dynamicPropSet: false, tableProps: [{ label: 'default', prop: 'default' }], diff --git a/src/views/modules/monitoring/realtimeQualityInspection.vue b/src/views/modules/monitoring/realtimeQualityInspection.vue index b888caf..6502710 100644 --- a/src/views/modules/monitoring/realtimeQualityInspection.vue +++ b/src/views/modules/monitoring/realtimeQualityInspection.vue @@ -8,8 +8,8 @@