Compare commits
No commits in common. "5f5e0ffc69036fb231408198dfcd92833e7002e2" and "b6d3b17300caec99da6ea620208d22da1c4387a3" have entirely different histories.
5f5e0ffc69
...
b6d3b17300
4
.env.dev
4
.env.dev
@ -18,9 +18,9 @@ VUE_APP_TITLE = MES系统
|
|||||||
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
|
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.49:48082'
|
# VUE_APP_BASE_API = 'http://192.168.1.49:48082'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
|
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.4.173:48082'
|
VUE_APP_BASE_API = 'http://192.168.4.173:48082'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
|
# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
|
||||||
VUE_APP_BASE_API = 'http://192.168.0.33:48082'
|
# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
|
# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
|
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
|
# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
|
||||||
|
|||||||
@ -1,196 +1,185 @@
|
|||||||
<template>
|
<template>
|
||||||
<div
|
<div class="app-container" id='energyReportBox'>
|
||||||
class="app-container"
|
|
||||||
id="energyReportBox">
|
<!-- 搜索工作栏 -->
|
||||||
<!-- 搜索工作栏 -->
|
<search-bar
|
||||||
<search-bar
|
:formConfigs="formConfig"
|
||||||
:formConfigs="formConfig"
|
ref="searchBarForm"
|
||||||
ref="searchBarForm"
|
:isFold="isFold"
|
||||||
:isFold="isFold"
|
@headBtnClick="buttonClick"
|
||||||
@headBtnClick="buttonClick" />
|
/>
|
||||||
<!-- 列表 -->
|
<!-- 列表 -->
|
||||||
<base-table
|
<base-table
|
||||||
:page="queryParams.pageNo"
|
:page="queryParams.pageNo"
|
||||||
:limit="queryParams.pageSize"
|
:limit="queryParams.pageSize"
|
||||||
:table-props="tableProps"
|
:table-props="tableProps"
|
||||||
:table-data="list"
|
:table-data="list"
|
||||||
:max-height="tableH" />
|
:max-height="tableH"
|
||||||
<pagination
|
/>
|
||||||
:page.sync="queryParams.pageNo"
|
<pagination
|
||||||
:limit.sync="queryParams.pageSize"
|
:page.sync="queryParams.pageNo"
|
||||||
:total="total"
|
:limit.sync="queryParams.pageSize"
|
||||||
@pagination="getList" />
|
:total="total"
|
||||||
</div>
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {
|
import { energyReportPageAuto, energyReportPageExportAuto } from "@/api/monitoring/energyReport"
|
||||||
energyReportPageAuto,
|
import { getEnergyTypeListAll } from "@/api/base/energyType";
|
||||||
energyReportPageExportAuto,
|
import { publicFormatter } from '@/utils/dict'
|
||||||
} from '@/api/monitoring/energyReport';
|
import { parseTime } from '@/utils/ruoyi'
|
||||||
import { getEnergyTypeListAll } from '@/api/base/energyType';
|
|
||||||
import { publicFormatter } from '@/utils/dict';
|
|
||||||
import { parseTime } from '@/utils/ruoyi';
|
|
||||||
const tableProps = [
|
const tableProps = [
|
||||||
{
|
{
|
||||||
prop: 'statisticType',
|
prop: 'statisticType',
|
||||||
label: '统计类型',
|
label: '统计类型',
|
||||||
filter: publicFormatter('statistic_type'),
|
filter: publicFormatter('statistic_type')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'startTime',
|
prop: 'startTime',
|
||||||
label: '开始时间',
|
label: '开始时间',
|
||||||
filter: parseTime,
|
filter: parseTime,
|
||||||
minWidth: 160,
|
minWidth: 160
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'endTime',
|
prop: 'endTime',
|
||||||
label: '结束时间',
|
label: '结束时间',
|
||||||
filter: parseTime,
|
filter: parseTime,
|
||||||
minWidth: 160,
|
minWidth: 160
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'statisticName',
|
prop: 'statisticName',
|
||||||
label: '统计方案',
|
label: '统计方案'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'energyType',
|
prop: 'energyType',
|
||||||
label: '能源类型',
|
label: '能源类型'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'startNum',
|
prop: 'startNum',
|
||||||
label: '抄表数(起始)',
|
label: '抄表数(起始)'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'endNum',
|
prop: 'endNum',
|
||||||
label: '抄表数(结束)',
|
label: '抄表数(结束)'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'useNum',
|
prop: 'useNum',
|
||||||
label: '消耗量',
|
label: '消耗量'
|
||||||
},
|
}
|
||||||
];
|
]
|
||||||
export default {
|
export default {
|
||||||
name: 'EnergyLimit',
|
name: "EnergyLimit",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
isFold: false,
|
isFold: false,
|
||||||
formConfig: [
|
formConfig: [
|
||||||
{
|
{
|
||||||
type: 'select',
|
type: 'select',
|
||||||
label: '能源类型',
|
label: '能源类型',
|
||||||
selectOptions: [],
|
selectOptions: [],
|
||||||
param: 'energyTypeId',
|
param: 'energyTypeId',
|
||||||
filterable: true,
|
filterable: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'select',
|
type: 'select',
|
||||||
label: '统计类型',
|
label: '统计类型',
|
||||||
selectOptions: this.getDictDatas(this.DICT_TYPE.STATISTIC_TYPE),
|
selectOptions: this.getDictDatas(this.DICT_TYPE.STATISTIC_TYPE),
|
||||||
labelField: 'label',
|
labelField: 'label',
|
||||||
valueField: 'value',
|
valueField: 'value',
|
||||||
param: 'statisticType',
|
param: 'statisticType'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'datePicker',
|
type: 'datePicker',
|
||||||
label: '时间',
|
label: '时间',
|
||||||
dateType: 'datetimerange',
|
dateType: 'datetimerange',
|
||||||
format: 'yyyy-MM-dd HH:mm:ss',
|
format: 'yyyy-MM-dd HH:mm:ss',
|
||||||
valueFormat: 'timestamp',
|
valueFormat: "timestamp",
|
||||||
rangeSeparator: '-',
|
rangeSeparator: '-',
|
||||||
startPlaceholder: '开始时间',
|
startPlaceholder: '开始时间',
|
||||||
endPlaceholder: '结束时间',
|
endPlaceholder: '结束时间',
|
||||||
param: 'timeVal',
|
param: 'timeVal',
|
||||||
defaultSelect: [],
|
defaultSelect: [],
|
||||||
width: 350,
|
width: 350
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'button',
|
type: 'button',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'separate',
|
type: 'separate'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('monitoring:energy-report:export')
|
type: this.$auth.hasPermi('monitoring:energy-report:export') ? 'button' : '',
|
||||||
? 'button'
|
btnName: '导出',
|
||||||
: '',
|
name: 'add',
|
||||||
btnName: '导出',
|
color: 'primary',
|
||||||
name: 'add',
|
plain: true
|
||||||
color: 'primary',
|
}
|
||||||
plain: true,
|
],
|
||||||
},
|
tableProps,
|
||||||
],
|
tableH: this.tableHeight(260),
|
||||||
tableProps,
|
// 总条数
|
||||||
tableH: this.tableHeight(260),
|
total: 0,
|
||||||
// 总条数
|
// 班次基础信息列表
|
||||||
total: 0,
|
list: [],
|
||||||
// 班次基础信息列表
|
// 查询参数
|
||||||
list: [],
|
queryParams: {
|
||||||
// 查询参数
|
pageNo: 1,
|
||||||
queryParams: {
|
pageSize: 20,
|
||||||
pageNo: 1,
|
energyTypeId: null,
|
||||||
pageSize: 20,
|
statisticType: null,
|
||||||
energyTypeId: null,
|
startTime: null,
|
||||||
statisticType: null,
|
endTime: null
|
||||||
startTime: null,
|
}
|
||||||
endTime: null,
|
};
|
||||||
},
|
},
|
||||||
};
|
created() {
|
||||||
},
|
window.addEventListener('resize', () => {
|
||||||
created() {
|
this.tableH = this.tableHeight(260)
|
||||||
window.addEventListener('resize', this._eventListeners);
|
this.isFold = this.searchBarWidth('energyReportBox', 1198)
|
||||||
this.getList();
|
})
|
||||||
this.getTypeList();
|
this.getList()
|
||||||
},
|
this.getTypeList()
|
||||||
mounted() {
|
},
|
||||||
this.isFold = this.searchBarWidth('energyReportBox', 1198);
|
mounted() {
|
||||||
},
|
this.isFold = this.searchBarWidth('energyReportBox', 1198)
|
||||||
destroyed() {
|
},
|
||||||
window.removeEventListener('resize', this._eventListeners);
|
methods: {
|
||||||
},
|
getTypeList() {
|
||||||
methods: {
|
getEnergyTypeListAll().then((res) => {
|
||||||
_eventListeners() {
|
this.formConfig[0].selectOptions = res.data || []
|
||||||
this.tableH = this.tableHeight(260);
|
// this.energyTypeList = res.data || []
|
||||||
this.isFold = this.searchBarWidth('energyReportBox', 1198);
|
})
|
||||||
},
|
},
|
||||||
getTypeList() {
|
buttonClick(val) {
|
||||||
getEnergyTypeListAll().then((res) => {
|
switch (val.btnName) {
|
||||||
this.formConfig[0].selectOptions = res.data || [];
|
case 'search':
|
||||||
// this.energyTypeList = res.data || []
|
this.queryParams.pageNo = 1
|
||||||
});
|
this.queryParams.energyTypeId = val.energyTypeId
|
||||||
},
|
this.queryParams.statisticType = val.statisticType
|
||||||
buttonClick(val) {
|
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
|
||||||
switch (val.btnName) {
|
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
|
||||||
case 'search':
|
this.getList()
|
||||||
this.queryParams.pageNo = 1;
|
break
|
||||||
this.queryParams.energyTypeId = val.energyTypeId;
|
default:
|
||||||
this.queryParams.statisticType = val.statisticType;
|
this.$modal.confirm('是否确认导出').then(() => {
|
||||||
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
|
return energyReportPageExportAuto({...this.queryParams});
|
||||||
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
|
}).then(response => {
|
||||||
this.getList();
|
this.$download.excel(response, '能源统计报表.xls');
|
||||||
break;
|
}).catch(() => {})
|
||||||
default:
|
}
|
||||||
this.$modal
|
},
|
||||||
.confirm('是否确认导出')
|
/** 查询列表 */
|
||||||
.then(() => {
|
getList() {
|
||||||
return energyReportPageExportAuto({ ...this.queryParams });
|
energyReportPageAuto(this.queryParams).then(response => {
|
||||||
})
|
this.list = response.data.list || [];
|
||||||
.then((response) => {
|
this.total = response.data.total;
|
||||||
this.$download.excel(response, '能源统计报表.xls');
|
});
|
||||||
})
|
}
|
||||||
.catch(() => {});
|
}
|
||||||
}
|
|
||||||
},
|
|
||||||
/** 查询列表 */
|
|
||||||
getList() {
|
|
||||||
energyReportPageAuto(this.queryParams).then((response) => {
|
|
||||||
this.list = response.data.list || [];
|
|
||||||
this.total = response.data.total;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user