Compare commits

..

No commits in common. "830de9fed914fbacc22db5eaec050c5b7255610f" and "f5107cfb700535d1821fea7d5727fef7dec8d912" have entirely different histories.

4 changed files with 56 additions and 38 deletions

View File

@ -36,8 +36,7 @@ const tableProps = [
},
{
prop: 'objCode',
label: '对象编码',
showOverflowtooltip: true
label: '对象编码'
},
{
prop: 'plcTableName',

View File

@ -46,8 +46,7 @@ const tableProps = [
prop: 'tableName',
label: '能源表名',
filter: publicFormatter('table_name'),
minWidth: 110,
showOverflowtooltip: true
minWidth: 110
},
{
prop: 'recordTime',

View File

@ -20,18 +20,15 @@ import * as XLSX from 'xlsx/xlsx.mjs'
const tableProps = [
{
prop: 'objName',
label: '统计对象',
showOverflowtooltip: true
label: '统计对象'
},
{
prop: 'objCode',
label: '对象编码',
showOverflowtooltip: true
label: '对象编码'
},
{
prop: 'energyTypeName',
label: '能源类型',
showOverflowtooltip: true
label: '能源类型'
},
{
prop: 'startValue',

View File

@ -2,23 +2,46 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
<!-- 列表 -->
<base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
:max-height="tableH">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="160" label="操作" :method-list="tableBtn"
@clickBtn="handleClick" />
<base-table
:page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-props="tableProps"
:table-data="list"
:max-height="tableH"
>
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="160"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
</base-table>
<pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
@pagination="getList" />
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
<!-- 新增 -->
<base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
@confirm="handleConfirm" :before-close="handleCancel">
<base-dialog
:dialogTitle="addOrEditTitle"
:dialogVisible="centervisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
>
<energy-statistics-add ref="energyStatistics" @successSubmit="successSubmit" />
</base-dialog>
<!-- 参数绑定/查看 -->
<energy-statistics-det ref="plcParam" @closeDrawer="closeDrawer"
:energyTypeList="energyTypeList"></energy-statistics-det>
<energy-statistics-det ref="plcParam" @closeDrawer="closeDrawer" :energyTypeList="energyTypeList"></energy-statistics-det>
</div>
</template>
@ -40,7 +63,7 @@ const tableProps = [
showOverflowtooltip: true
},
{
prop: 'type',
prop: 'type',
label: '统计类型',
filter: publicFormatter('statistic_type')
},
@ -58,7 +81,7 @@ const tableProps = [
}
]
export default {
name: "EnergyStatistics",
name: "energyStatistics",
components: { EnergyStatisticsAdd, EnergyStatisticsDet },
data() {
return {
@ -89,26 +112,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),
@ -201,13 +224,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()