diff --git a/src/views/energy/base/energyPlcConnect/index.vue b/src/views/energy/base/energyPlcConnect/index.vue index a7303062..c189d06c 100644 --- a/src/views/energy/base/energyPlcConnect/index.vue +++ b/src/views/energy/base/energyPlcConnect/index.vue @@ -36,7 +36,8 @@ const tableProps = [ }, { prop: 'objCode', - label: '对象编码' + label: '对象编码', + showOverflowtooltip: true }, { prop: 'plcTableName', diff --git a/src/views/energy/base/energyQuantityManual/index.vue b/src/views/energy/base/energyQuantityManual/index.vue index 26a19624..036c8b83 100644 --- a/src/views/energy/base/energyQuantityManual/index.vue +++ b/src/views/energy/base/energyQuantityManual/index.vue @@ -46,7 +46,8 @@ const tableProps = [ prop: 'tableName', label: '能源表名', filter: publicFormatter('table_name'), - minWidth: 110 + minWidth: 110, + showOverflowtooltip: true }, { prop: 'recordTime', diff --git a/src/views/energy/base/energyQuantityRealtime/index.vue b/src/views/energy/base/energyQuantityRealtime/index.vue index a8b9e6ed..b0226246 100644 --- a/src/views/energy/base/energyQuantityRealtime/index.vue +++ b/src/views/energy/base/energyQuantityRealtime/index.vue @@ -20,15 +20,18 @@ import * as XLSX from 'xlsx/xlsx.mjs' const tableProps = [ { prop: 'objName', - label: '统计对象' + label: '统计对象', + showOverflowtooltip: true }, { prop: 'objCode', - label: '对象编码' + label: '对象编码', + showOverflowtooltip: true }, { prop: 'energyTypeName', - label: '能源类型' + label: '能源类型', + showOverflowtooltip: true }, { prop: 'startValue', diff --git a/src/views/energy/monitoring/energyStatistics/index.vue b/src/views/energy/monitoring/energyStatistics/index.vue index 87f6aa54..1bdcb6c0 100644 --- a/src/views/energy/monitoring/energyStatistics/index.vue +++ b/src/views/energy/monitoring/energyStatistics/index.vue @@ -2,46 +2,23 @@
- + - - + + - + - + - +
@@ -63,7 +40,7 @@ const tableProps = [ showOverflowtooltip: true }, { - prop: 'type', + prop: 'type', label: '统计类型', filter: publicFormatter('statistic_type') }, @@ -81,7 +58,7 @@ const tableProps = [ } ] export default { - name: "energyStatistics", + name: "EnergyStatistics", components: { EnergyStatisticsAdd, EnergyStatisticsDet }, data() { return { @@ -112,26 +89,26 @@ export default { tableProps, tableBtn: [ this.$auth.hasPermi('monitoring:energy-statistics:bind') - ? { + ? { type: 'connect', btnName: '绑定' } - : undefined, + : undefined, { type: 'detail', btnName: '详情' }, this.$auth.hasPermi('monitoring:energy-statistics:update') ? { - type: 'edit', - btnName: '编辑' - } + type: 'edit', + btnName: '编辑' + } : undefined, this.$auth.hasPermi('monitoring:energy-statistics:delete') ? { - type: 'delete', - btnName: '删除' - } + type: 'delete', + btnName: '删除' + } : undefined ].filter((v) => v), tableH: this.tableHeight(260), @@ -224,13 +201,13 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - this.$modal.confirm('是否确认删除方案名称为"' + row.name + '"的数据项?').then(function() { - return deleteEnergyStatistics(row.id); - }).then(() => { - this.queryParams.pageNo = 1; - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); + this.$modal.confirm('是否确认删除方案名称为"' + row.name + '"的数据项?').then(function () { + return deleteEnergyStatistics(row.id); + }).then(() => { + this.queryParams.pageNo = 1; + this.getList(); + this.$modal.msgSuccess("删除成功"); + }).catch(() => { }); }, closeDrawer() { this.getList()