Compare commits

..

No commits in common. "f6d866907c3e2e4ae32f4a08a8c2bdaffbbd6df0" and "d1ad913bab49ac3a831ae052c2184d14e4445344" have entirely different histories.

18 changed files with 1372 additions and 1978 deletions

View File

@ -18,7 +18,7 @@ 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:9001' # 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'

View File

@ -53,28 +53,4 @@ export function energyQuantityManualExport(data) {
data: data, data: data,
responseType: 'blob' responseType: 'blob'
}) })
}
// 获得能源表名配置分页
export function energyTablePage(data) {
return request({
url: '/base/energy-table/page',
method: 'post',
data: data
})
}
// 获得能源表名配置
export function energyTableGet(query) {
return request({
url: '/base/energy-table/get',
method: 'get',
params: query
})
}
// 更新能源表名配置
export function energyTableUpdate(data) {
return request({
url: '/base/energy-table/update',
method: 'put',
data: data
})
} }

View File

@ -32,7 +32,6 @@ const actions = {
} }
// 处理 dictValue 层级 // 处理 dictValue 层级
dictDataMap[dictData.dictType].push({ dictDataMap[dictData.dictType].push({
id: dictData.id,
value: dictData.value, value: dictData.value,
label: dictData.label, label: dictData.label,
colorType: dictData.colorType, colorType: dictData.colorType,

View File

@ -14,7 +14,7 @@ export default {
return { return {
chartDom: '', chartDom: '',
chart: '', chart: '',
chartHeight: this.tableHeight(314), chartHeight: this.tableHeight(214) - 100,
}; };
}, },
props: { props: {
@ -37,7 +37,7 @@ export default {
}, },
mounted() { mounted() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.chartHeight = this.tableHeight(314); this.chartHeight = this.tableHeight(214) - 70;
}); });
}, },
methods: { methods: {

View File

@ -1,119 +1,102 @@
<template> <template>
<div <div id="analysischartLine" style="width: 100%;height: 100%;"></div>
id="analysischartLine"
style="width: 100%"
:style="{ height: chartHeight + 'px' }"></div>
</template> </template>
<script> <script>
import * as echarts from 'echarts'; import * as echarts from 'echarts'
import resize from '@/utils/chartMixins/resize'; import resize from '@/utils/chartMixins/resize'
export default { export default {
name: 'LineChart', name: "LineChart",
mixins: [resize], mixins: [resize],
data() { data() {
return { return {
chartDom: '', chartDom: '',
chart: '', chart: '',
chartHeight: this.tableHeight(250) / 2, chartHeight: this.tableHeight(214) - 70
}; }
}, },
props: { props: {
chartData: { chartData: {
type: Array, type: Array,
required: true, required: true,
default: () => { default: () => {
return []; return []
}, }
}, }
}, },
watch: { watch: {
chartData: function () { chartData: function () {
this.getChart(); this.getChart()
}, }
}, },
mounted() { mounted() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.chartHeight = this.tableHeight(250) / 2; this.chartHeight = this.tableHeight(214) - 70
}); })
}, },
methods: { methods: {
getChart() { getChart() {
if ( if (
this.chart !== null && this.chart !== null &&
this.chart !== '' && this.chart !== '' &&
this.chart !== undefined this.chart !== undefined
) { ) {
this.chart.dispose(); // Dom this.chart.dispose() // Dom
} }
this.chartDom = document.getElementById('analysischartLine'); this.chartDom = document.getElementById('analysischartLine')
this.chart = echarts.init(this.chartDom); this.chart = echarts.init(this.chartDom)
if (this.chartData.length === 0) { if (this.chartData.length === 0) {
return false; return false
} }
let xData = []; let xData = []
let arr = this.chartData[0].type; let arr = this.chartData[0].type
let keys = Object.keys(this.chartData[0]); let keys = Object.keys(this.chartData[0])
let yData = []; let yData = []
for (let j = 0; j < arr.length; j++) { for (let j = 0; j < arr.length; j++) {
for (let k = 0; k < keys.length; k++) { for (let k = 0; k < keys.length; k++) {
if ( if (keys[k].indexOf(arr[j] + '_上年同期') > -1 || keys[k].indexOf(arr[j] + '_能源消耗') > -1) {
keys[k].indexOf(arr[j] + '_上年同期') > -1 || let obj = {
keys[k].indexOf(arr[j] + '_能源消耗') > -1 name: '',
) { type: 'line',
let obj = { data: []
name: '', }
type: 'line', obj.name = keys[k]
data: [], yData.push(obj)
}; }
obj.name = keys[k]; }
yData.push(obj); }
} for (let i = 0; i < this.chartData.length; i++) {
} xData.push(this.chartData[i].time)
} for (let p = 0; p < yData.length; p++) {
for (let i = 0; i < this.chartData.length; i++) { yData[p].data.push(this.chartData[i][yData[p].name])
xData.push(this.chartData[i].time); }
for (let p = 0; p < yData.length; p++) { }
yData[p].data.push(this.chartData[i][yData[p].name]); var option = {
} color: ['#FFDC94', '#8EF0AB', '#63BDFF', '#288AFF', '#7164FF', '#FF6860', '#FF9747', '#B0EB42', '#D680FF', '#0043D2'],
} legend: {
var option = { data: keys,
color: [ right: '1%'
'#FFDC94', },
'#8EF0AB', tooltip: {
'#63BDFF', trigger: 'axis'
'#288AFF', },
'#7164FF', grid: {
'#FF6860', left: '1%',
'#FF9747', right: '1%',
'#B0EB42', bottom: '3%',
'#D680FF', containLabel: true
'#0043D2', },
], xAxis: {
legend: { type: 'category',
data: keys, data: xData
right: '1%', },
}, yAxis: {
tooltip: { type: 'value'
trigger: 'axis', },
}, series: yData
grid: { };
left: '1%',
right: '1%',
bottom: '3%',
containLabel: true,
},
xAxis: {
type: 'category',
data: xData,
},
yAxis: {
type: 'value',
},
series: yData,
};
option && this.chart.setOption(option); option && this.chart.setOption(option);
}, }
}, }
}; }
</script> </script>

View File

@ -1,153 +1,143 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<search-area <search-area @submit="getList" @exportD="exportData"/>
@submit="getList" <div v-show='chartData.length'>
@exportD="exportData" /> <div class="chartTitle">同比分析图</div>
<div v-show="chartData.length"> <div style='width: 100%;height: 400px;'>
<div class="chartTitle">同比分析图</div> <line-chart ref="analysisLineChart" :chartData="chartData"/>
<div style="width: 100%"> </div>
<line-chart <!-- 表格 -->
ref="analysisLineChart" <base-table
:chartData="chartData" /> :table-props="tableProps"
</div> :table-data="list"
<!-- 表格 --> :max-height="tableH"
<base-table class="yoy-out-table"
:table-props="tableProps" />
:table-data="list" </div>
:max-height="tableH" <!-- 没有数据 -->
class="yoy-out-table" /> <div class="no-data-bg" v-show='!chartData.length'></div>
</div> </div>
<!-- 没有数据 -->
<div
class="no-data-bg"
v-show="!chartData.length"></div>
</div>
</template> </template>
<script> <script>
import { getYoy } from '@/api/analysis/energyAnalysis'; import { getYoy } from "@/api/analysis/energyAnalysis"
import subRate from './components/subRate.vue'; import subRate from "./components/subRate.vue"
import SearchArea from './components/searchArea'; import SearchArea from "./components/searchArea"
import LineChart from './components/lineChart'; import LineChart from "./components/lineChart"
import FileSaver from 'file-saver'; import FileSaver from "file-saver"
import * as XLSX from 'xlsx/xlsx.mjs'; import * as XLSX from 'xlsx/xlsx.mjs'
export default { export default {
name: 'YoyAnalysis', name: 'YoyAnalysis',
components: { SearchArea, LineChart }, components: { SearchArea, LineChart },
data() { data() {
return { return {
chartData: [], chartData: [],
tableProps: [], tableProps: [],
list: [], list: [],
tableH: this.tableHeight(250) / 2, tableH: this.tableHeight(640)
}; }
}, },
mounted() { mounted() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.tableH = this.tableHeight(250) / 2; this.tableH = this.tableHeight(640)
}); })
}, },
methods: { methods: {
getList(params) { getList(params) {
getYoy({ ...params }).then((res) => { getYoy({ ...params }).then((res) => {
if (res.code === 0 && res.data) { if (res.code === 0 && res.data) {
this.getTableList(res.data); this.getTableList(res.data)
} else { } else {
this.chartData = []; this.chartData = []
this.list = []; this.list = []
} }
}); })
}, },
getTableList(arr) { getTableList(arr) {
let data = arr.data; let data = arr.data
let nameData = arr.nameData; let nameData = arr.nameData
let tempX = []; let tempX = []
data[0].data.map((item) => { data[0].data.map((item) => {
let obj = {}; let obj = {}
obj.prop = item.dynamicName; obj.prop = item.dynamicName
obj.label = item.dynamicName; obj.label = item.dynamicName
obj.id = item.id; obj.id = item.id
obj.children = []; obj.children = []
tempX.push(obj); tempX.push(obj)
}); })
for (let i = 0; i < nameData.length; i++) { for (let i = 0; i < nameData.length; i++) {
for (let j = 0; j < tempX.length; j++) { for (let j = 0; j < tempX.length; j++) {
if (tempX[j].id === nameData[i].parentId) { if (tempX[j].id === nameData[i].parentId) {
let obj = {}; let obj = {}
obj.prop = tempX[j].prop + '_' + nameData[i].name; obj.prop = tempX[j].prop + '_' + nameData[i].name
obj.label = nameData[i].name; obj.label = nameData[i].name
if (obj.label.indexOf('同比') != -1) { if (obj.label.indexOf('同比')!= -1) {
obj.subcomponent = subRate; obj.subcomponent = subRate
} }
tempX[j].children.push(obj); tempX[j].children.push(obj)
} }
} }
} }
this.tableProps = [{ prop: 'time', label: '时间' }].concat(tempX); this.tableProps = [{prop: 'time',label: '时间'}].concat(tempX)
console.log(this.tableProps); console.log(this.tableProps)
// //
this.list = []; this.list = []
for (let k = 0; k < data.length; k++) { for (let k = 0; k < data.length; k++) {
let obj = {}; let obj = {}
obj.time = data[k].time; obj.time = data[k].time
let arr1 = data[k].data; let arr1 = data[k].data
obj.type = []; obj.type = []
for (let q = 0; q < arr1.length; q++) { for (let q = 0; q < arr1.length; q++) {
let name = arr1[q].dynamicName; let name = arr1[q].dynamicName
obj.type.push(name); obj.type.push(name)
let arr2 = arr1[q].children; let arr2 = arr1[q].children
for (let p = 0; p < arr2.length; p++) { for (let p = 0; p < arr2.length; p++) {
let prop = name + '_' + arr2[p].dynamicName; let prop = name + '_' + arr2[p].dynamicName
obj[prop] = arr2[p].dynamicValue; obj[prop] = arr2[p].dynamicValue
} }
} }
this.list.push(obj); this.list.push(obj)
} }
this.chartData = this.list; this.chartData = this.list
}, },
exportData(val) { exportData(val) {
if (this.list.length > 0) { if (this.list.length > 0) {
var wb = XLSX.utils.table_to_book( var wb = XLSX.utils.table_to_book(document.querySelector(".yoy-out-table"))
document.querySelector('.yoy-out-table') let fileName = val.name + "同比分析.xlsx"
); var wbout = XLSX.write(wb, {
let fileName = val.name + '同比分析.xlsx'; bookType: "xlsx",
var wbout = XLSX.write(wb, { bookSST: true,
bookType: 'xlsx', type: "array"
bookSST: true, })
type: 'array', try {
}); FileSaver.saveAs(
try { new Blob([wbout], { type: "application/octet-stream" }),
FileSaver.saveAs( fileName
new Blob([wbout], { type: 'application/octet-stream' }), )
fileName } catch (e) {
); if (typeof console !== "undefined") console.log(e, wbout);
} catch (e) { }
if (typeof console !== 'undefined') console.log(e, wbout); return wbout
} } else {
return wbout; this.$modal.msgWarning("暂无数据导出")
} else { }
this.$modal.msgWarning('暂无数据导出'); }
} }
}, }
},
};
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>
.yoy-out-table {
margin-top: 20px;
}
.chartTitle { .chartTitle {
font-size: 16px; font-size: 16px;
color: #000; color: #000;
} }
.chartTitle::before { .chartTitle::before {
content: ''; content: '';
display: inline-block; display: inline-block;
width: 4px; width: 4px;
height: 18px; height: 18px;
background-color: #0b58ff; background-color: #0B58FF;
border-radius: 1px; border-radius: 1px;
margin-right: 8px; margin-right: 8px;
vertical-align: bottom; vertical-align: bottom;
} }
</style> </style>

View File

@ -1,163 +1,132 @@
<template> <template>
<el-form <el-form ref="form" :rules="rules" label-width="100px" :model="form">
ref="form" <el-row>
:rules="rules" <el-col :span="12">
label-width="100px" <el-form-item label="能源类型" prop="typeId">
:model="form"> <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;" filterable>
<el-row> <el-option
<el-col :span="12"> v-for="item in energyListType"
<el-form-item :key="item.id"
label="能源类型" :label="item.name"
prop="typeId"> :value="item.id">
<el-select </el-option>
v-model="form.typeId" </el-select>
placeholder="请选择" </el-form-item>
style="width: 100%" </el-col>
filterable> <el-col :span="12">
<el-option <el-form-item label="参数列名" prop="plcParamName">
v-for="item in energyListType" <el-input v-model="form.plcParamName"></el-input>
:key="item.id" </el-form-item>
:label="item.labelName" </el-col>
:value="item.id"></el-option> </el-row>
</el-select> <el-row>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="参数名称" prop="name">
<el-col :span="12"> <el-input v-model="form.name"></el-input>
<el-form-item </el-form-item>
label="参数列名" </el-col>
prop="plcParamName"> <el-col :span="12">
<el-input v-model="form.plcParamName"></el-input> <el-form-item label="单位" prop="unit">
</el-form-item> <el-select v-model="form.unit" placeholder="请选择" style="width: 100%;">
</el-col> <el-option
</el-row> v-for="item in getDictDatas(DICT_TYPE.ENERGY_UNIT)"
<el-row> :key="item.value"
<el-col :span="12"> :label="item.label"
<el-form-item :value="item.value">
label="参数名称" </el-option>
prop="name"> </el-select>
<el-input v-model="form.name"></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> </el-row>
<el-col :span="12"> <el-row>
<el-form-item <el-col :span="12">
label="单位" <el-form-item label="是否采集" prop="collection">
prop="unit"> <el-switch v-model="form.collection"></el-switch>
<el-select </el-form-item>
v-model="form.unit" </el-col>
placeholder="请选择" <el-col :span="12">
style="width: 100%"> <el-form-item label="描述" prop="description">
<el-option <el-input v-model="form.description"></el-input>
v-for="item in getDictDatas(DICT_TYPE.UNIT_DICT)" </el-form-item>
:key="item.value" </el-col>
:label="item.label" </el-row>
:value="item.value"></el-option> </el-form>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item
label="是否采集"
prop="collection">
<el-switch v-model="form.collection"></el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="描述"
prop="description">
<el-input v-model="form.description"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template> </template>
<script> <script>
import { import { getEnergyPlcParam, updateEnergyPlcParam, createEnergyPlcParam } from '@/api/base/energyPlcParam'
getEnergyPlcParam, import { getEnergyTypeListAll } from '@/api/base/energyType'
updateEnergyPlcParam,
createEnergyPlcParam,
} from '@/api/base/energyPlcParam';
import { getEnergyTypeListAll } from '@/api/base/energyType';
export default { export default {
name: 'EnergyPlcParamAdd', name: 'EnergyPlcParamAdd',
data() { data() {
return { return {
form: { form: {
id: '', id: '',
typeId: '', typeId: '',
plcParamName: '', plcParamName: '',
name: '', name: '',
unit: '', unit: '',
description: '', description: '',
collection: true, collection: true,
connectId: '', connectId: ''
}, },
energyListType: [], energyListType: [],
isEdit: false, // isEdit: false, //
rules: { rules: {
typeId: [ typeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
{ required: true, message: '能源类型不能为空', trigger: 'change' }, plcParamName: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
], name: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }]
plcParamName: [ }
{ required: true, message: '参数列名不能为空', trigger: 'blur' }, }
], },
name: [ methods: {
{ required: true, message: '参数名称不能为空', trigger: 'blur' }, init(param) {
], this.form.connectId = param.connectId
}, getEnergyTypeListAll().then((res) => {
}; this.energyListType = res.data || []
}, })
methods: { if (param.id) {
init(param) { this.isEdit = true
this.form.connectId = param.connectId; this.form.id = param.id
getEnergyTypeListAll().then((res) => { getEnergyPlcParam(this.form.id).then((res) => {
this.energyListType = res.data || []; if (res.code === 0) {
}); this.form = res.data
if (param.id) { this.form.collection = this.form.collection === 0 ? false : true
this.isEdit = true; }
this.form.id = param.id; })
getEnergyPlcParam(this.form.id).then((res) => { } else {
if (res.code === 0) { this.isEdit = false
this.form = res.data; this.form.id = ''
this.form.collection = this.form.collection === 0 ? false : true; }
} },
}); submitForm() {
} else { this.$refs['form'].validate((valid) => {
this.isEdit = false; if (valid) {
this.form.id = ''; this.form.collection = this.form.collection === false ? 0 : 1
} if (this.isEdit) {
}, //
submitForm() { updateEnergyPlcParam({...this.form}).then((res) => {
this.$refs['form'].validate((valid) => { if (res.code === 0) {
if (valid) { this.$modal.msgSuccess("操作成功");
this.form.collection = this.form.collection === false ? 0 : 1; this.$emit('successSubmit')
if (this.isEdit) { }
// })
updateEnergyPlcParam({ ...this.form }).then((res) => { } else {
if (res.code === 0) { createEnergyPlcParam({...this.form}).then((res) => {
this.$modal.msgSuccess('操作成功'); if (res.code === 0) {
this.$emit('successSubmit'); this.$modal.msgSuccess("操作成功");
} this.$emit('successSubmit')
}); }
} else { })
createEnergyPlcParam({ ...this.form }).then((res) => { }
if (res.code === 0) { } else {
this.$modal.msgSuccess('操作成功'); return false
this.$emit('successSubmit'); }
} })
}); },
} formClear() {
} else { this.$refs.form.resetFields()
return false; this.isEdit = false
} }
}); }
}, }
formClear() {
this.$refs.form.resetFields();
this.isEdit = false;
},
},
};
</script> </script>

View File

@ -1,139 +0,0 @@
<template>
<div class="energyQuantityManualAddTable">
<el-table
:data="renderData"
border
style="width: 100%"
:header-cell-style="{
background: '#F2F4F9',
color: '#606266',
}">
<el-table-column
prop="tableName"
label="表名*">
<template slot-scope="scope">
<div class="tableInner">
<el-select
v-model="scope.row.tableName"
placeholder="请选择"
style="width: 100%"
@change="changeSelect(scope.row, 'tableName')">
<el-option
v-for="item in tableNameList"
:key="item.id"
:label="item.label"
:value="item.id"></el-option>
</el-select>
</div>
</template>
</el-table-column>
<el-table-column
prop="readingQuantity"
label="抄表数*">
<template slot-scope="scope">
<div class="tableInner">
<el-input-number
v-model="scope.row.readingQuantity"
:min="0"
:max="999999999"
style="width: 100%"
:controls="false"
@change="changeInput(scope.row, 'readingQuantity')"
:precision="2"></el-input-number>
</div>
</template>
</el-table-column>
</el-table>
<el-button
class="addButton"
icon="el-icon-plus"
@click="emitButtonClick">
新增
</el-button>
</div>
</template>
<script>
export default {
name: 'AddTable',
props: {
tableData: {
type: Array,
required: true,
default: () => {
return [];
},
},
tableNameList: {
type: Array,
required: true,
default: () => {
return [];
},
},
},
data() {
return {};
},
computed: {
renderData() {
return this.tableData.map((item, index) => {
return {
...item,
_pageIndex: index + 1,
};
});
},
},
methods: {
emitButtonClick() {
this.$emit('emitButtonClick');
},
changeInput(val1, val2) {
val1.prop = val2;
this.$emit('emitFun', val1);
},
changeSelect(val1, val2) {
val1.prop = val2;
this.$emit('emitFun', val1);
},
},
};
</script>
<style lang='scss' scoped>
.energyQuantityManualAddTable {
.el-table .el-table__cell {
padding: 0;
height: 35px;
}
.addButton {
width: 100%;
height: 35px;
border-top: none;
color: #0b58ff;
border-color: #ebeef5;
border-radius: 0;
}
.addButton:hover {
color: #0b58ff;
border-color: #ebeef5;
background-color: #fff;
}
.addButton:focus {
border-color: #ebeef5;
background-color: #fff;
}
.tableInner .el-input__inner {
border: none;
padding: 0;
height: 33px;
}
}
</style>
<style lang='scss'>
.energyQuantityManualAddTable {
.el-table .el-table__cell {
padding: 0;
height: 35px;
}
}
</style>

View File

@ -1,228 +1,167 @@
<template> <template>
<el-form <el-form ref="energyQuantityManualForm" :rules="rules" label-width="90px" :model="form">
ref="energyQuantityManualForm" <el-row :gutter="20">
:rules="rules" <el-col :span='12'>
label-width="90px" <el-form-item label="能源类型" prop="energyTypeId">
:model="form"> <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
<el-row :gutter="20"> <el-option v-for="item in this.energyTypeList" :key="item.id" :label="item.name" :value="item.id">
<el-col :span="12"> </el-option>
<el-form-item </el-select>
label="能源类型" </el-form-item>
prop="energyTypeId"> </el-col>
<el-select <el-col :span='12'>
v-model="form.energyTypeId" <el-form-item label="抄表日期" prop="recordTime">
placeholder="请选择" <el-date-picker v-model="form.recordTime" type="date" format="yyyy-MM-dd" value-format="timestamp"
style="width: 100%" placeholder="选择日期" style="width: 100%;">
@change="selEnergyType" </el-date-picker>
filterable> </el-form-item>
<el-option </el-col>
v-for="item in this.energyTypeList" </el-row>
:key="item.id" <el-row :gutter="20">
:label="item.labelName" <el-col :span='24'>
:value="item.id"></el-option> <base-table border :table-props="tableProps" :table-data="tableData" :add-button-show="addButtonShow"
</el-select> @emitFun="inputChange" @emitButtonClick="emitButtonClick" />
</el-form-item> </el-col>
</el-col> </el-row>
<el-col :span="12"> </el-form>
<el-form-item
label="抄表日期"
prop="recordTime">
<el-date-picker
v-model="form.recordTime"
type="date"
format="yyyy-MM-dd"
value-format="timestamp"
placeholder="选择日期"
style="width: 100%"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<add-table
:table-props="tableProps"
:table-data="tableData"
:table-name-list="tableNameList"
@emitFun="inputChange"
@emitButtonClick="emitButtonClick" />
<!-- <base-table
border
:table-props="tableProps"
:table-data="tableData"
:add-button-show="addButtonShow"
@emitFun="inputChange"
@emitButtonClick="emitButtonClick" /> -->
</el-col>
</el-row>
</el-form>
</template> </template>
<script> <script>
import { import { energyQuantityManualCreate, energyQuantityManualUpdate, energyQuantityManualGet } from '@/api/base/energyQuantityManual'
energyQuantityManualCreate, import moment from 'moment'
energyQuantityManualUpdate, import InputArea from './InputArea'
energyQuantityManualGet, import SelectArea from './SelectArea'
} from '@/api/base/energyQuantityManual';
import moment from 'moment';
import AddTable from './AddTable';
import InputArea from './InputArea';
import SelectArea from './SelectArea';
import { energyTableGet } from '@/api/base/energyQuantityManual';
const tableProps = [ const tableProps = [
{ {
prop: 'tableName', prop: 'tableName',
label: '表名*', label: '表名*',
subcomponent: SelectArea, subcomponent: SelectArea
}, },
{ {
prop: 'readingQuantity', prop: 'readingQuantity',
label: '抄表数*', label: '抄表数*',
subcomponent: InputArea, subcomponent: InputArea
}, }
]; ]
export default { export default {
name: 'EnergyQuantityManualAdd', name: 'EnergyQuantityManualAdd',
props: { props: {
energyTypeList: { energyTypeList: {
type: Array, type: Array,
required: true, required: true,
default: () => { default: () => {
return []; return []
}, }
}, }
}, },
data() { data() {
return { return {
tableProps, tableProps,
tableData: [], tableData: [],
tableNameList: [], //list addButtonShow: '新增',
addButtonShow: '新增', form: {
form: { id: '',
id: '', energyTypeId: '',
energyTypeId: '', unit: '',
unit: '', recordTime: ''
recordTime: '', },
}, rules: {
rules: { energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
energyTypeId: [ recordTime: [{ required: true, message: '抄表日期不能为空', trigger: 'change' }]
{ required: true, message: '能源类型不能为空', trigger: 'change' }, },
], isEdit: false
recordTime: [ }
{ required: true, message: '抄表日期不能为空', trigger: 'change' }, },
], methods: {
}, init(params) {
isEdit: false, this.form.recordTime = moment().valueOf()
}; if (params.type === 'add') {
}, this.isEdit = false
components: { AddTable }, } else if (params.type === 'meterReading') {
methods: { this.isEdit = false
init(params) { this.form.energyTypeId = params.energyTypeId
this.form.recordTime = moment().valueOf(); let obj = {}
if (params.type === 'add') { obj.tableName = params.tableName + ''
this.isEdit = false; obj.readingQuantity = 0
} else if (params.type === 'meterReading') { this.tableData.push(obj)
this.isEdit = false; } else {
this.form.energyTypeId = params.energyTypeId; this.isEdit = true
let obj = {}; this.form.id = params.id
obj.tableName = params.tableName + ''; this.addButtonShow = ''
obj.readingQuantity = 0; energyQuantityManualGet({ id: this.form.id }).then(res => {
this.tableData.push(obj); if (res.code === 0) {
} else { this.form.energyTypeId = res.data.energyTypeId
this.isEdit = true; this.form.recordTime = res.data.recordTime ? res.data.recordTime : null
this.form.id = params.id; let obj = {}
this.addButtonShow = ''; obj.tableName = res.data.tableName ? res.data.tableName + '' : ''
energyQuantityManualGet({ id: this.form.id }).then((res) => { obj.readingQuantity = res.data.readingQuantity
if (res.code === 0) { this.tableData.push(obj)
this.form.energyTypeId = res.data.energyTypeId; }
this.form.recordTime = res.data.recordTime })
? res.data.recordTime }
: null; },
let obj = {}; inputChange(val) {
obj.tableName = res.data.tableName ? res.data.tableName + '' : ''; this.tableData[val._pageIndex - 1][val.prop] = val[val.prop]
obj.readingQuantity = res.data.readingQuantity; },
this.tableData.push(obj); emitButtonClick() {
} let obj = {}
}); obj.tableName = ''
} obj.readingQuantity = 0
}, this.tableData.push(obj)
inputChange(val) { },
this.tableData[val._pageIndex - 1][val.prop] = val[val.prop]; submitForm() {
console.log(this.tableData); this.$refs['energyQuantityManualForm'].validate((valid) => {
}, if (valid) {
emitButtonClick() { //
if (!this.form.energyTypeId) { if (this.tableData.length === 0) {
this.$modal.msgWarning('请先选择能源类型'); this.$modal.msgError("抄表数据不能为空");
return false; return false
} } else {
let obj = {}; for (let item of this.tableData) {
obj.tableName = ''; console.log(item)
obj.readingQuantity = 0; if (!item.tableName || (!item.readingQuantity && item.readingQuantity !== 0)) {
this.tableData.push(obj); this.$modal.msgError("抄表数据有空值,请检查");
}, return false
selEnergyType(id) { }
// }
this.tableData = []; }
this.tableNameList = []; if (this.isEdit) {
energyTableGet({ energyTypeId: id }).then((res) => { //
this.tableNameList = res.data.tableObjs || []; energyQuantityManualUpdate({
}); id: this.form.id,
}, energyTypeId: this.form.energyTypeId,
submitForm() { recordTime: this.form.recordTime,
this.$refs['energyQuantityManualForm'].validate((valid) => { tableName: this.tableData[0].tableName,
if (valid) { readingQuantity: this.tableData[0].readingQuantity
// }).then((res) => {
if (this.tableData.length === 0) { if (res.code === 0) {
this.$modal.msgError('抄表数据不能为空'); this.$modal.msgSuccess("操作成功");
return false; this.$emit('successSubmit')
} else { }
for (let item of this.tableData) { })
console.log(item); } else {
if ( energyQuantityManualCreate({
!item.tableName || energyTypeId: this.form.energyTypeId,
(!item.readingQuantity && item.readingQuantity !== 0) recordTime: this.form.recordTime,
) { data: this.tableData
this.$modal.msgError('抄表数据有空值,请检查'); }).then((res) => {
return false; if (res.code === 0) {
} this.$modal.msgSuccess("操作成功");
} this.$emit('successSubmit')
} }
if (this.isEdit) { })
// }
energyQuantityManualUpdate({ } else {
id: this.form.id, return false
energyTypeId: this.form.energyTypeId, }
recordTime: this.form.recordTime, })
tableName: this.tableData[0].tableName, },
readingQuantity: this.tableData[0].readingQuantity, formClear() {
}).then((res) => { this.$refs.energyQuantityManualForm.resetFields()
if (res.code === 0) { this.form.unit = ''
this.$modal.msgSuccess('操作成功'); this.isEdit = false
this.$emit('successSubmit'); this.addButtonShow = '新增'
} this.tableData = []
}); }
} else { }
energyQuantityManualCreate({ }
energyTypeId: this.form.energyTypeId,
recordTime: this.form.recordTime,
data: this.tableData,
}).then((res) => {
if (res.code === 0) {
this.$modal.msgSuccess('操作成功');
this.$emit('successSubmit');
}
});
}
} else {
return false;
}
});
},
formClear() {
this.$refs.energyQuantityManualForm.resetFields();
this.form.unit = '';
this.isEdit = false;
this.addButtonShow = '新增';
this.tableData = [];
},
},
};
</script> </script>

View File

@ -1,321 +1,271 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<search-bar <!-- 搜索工作栏 -->
:formConfigs="formConfig" <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
ref="searchBarForm" <!-- 列表 -->
@headBtnClick="buttonClick" /> <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
<!-- 列表 --> :max-height="tableH" @selection-change="selectChange">
<base-table <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
:page="queryParams.pageNo" @clickBtn="handleClick" />
:limit="queryParams.pageSize" </base-table>
:table-props="tableProps" <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
:table-data="list" @pagination="getList" />
:max-height="tableH" <!-- 新增 -->
@selection-change="selectChange"> <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
<method-btn @confirm="handleConfirm" :before-close="handleCancel">
v-if="tableBtn.length" <energy-quantity-manual-add ref="energyQuantityManualAdd" :energyTypeList="energyTypeList"
slot="handleBtn" @successSubmit="successSubmit" />
:width="120" </base-dialog>
label="操作" </div>
:method-list="tableBtn"
@clickBtn="handleClick" />
</base-table>
<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">
<energy-quantity-manual-add
ref="energyQuantityManualAdd"
:energyTypeList="energyTypeList"
@successSubmit="successSubmit" />
</base-dialog>
</div>
</template> </template>
<script> <script>
import { import { energyQuantityManualPage, energyQuantityManualDelete, energyQuantityManualExport } from "@/api/base/energyQuantityManual"
energyQuantityManualPage, import { getEnergyTypeListAll } from "@/api/base/energyType"
energyQuantityManualDelete, import { publicFormatter } from '@/utils/dict'
energyQuantityManualExport, import { parseTime, parseTimeTable } from '@/utils/ruoyi'
} from '@/api/base/energyQuantityManual'; // import FileSaver from "file-saver"
import { getEnergyTypeListAll } from '@/api/base/energyType'; // import * as XLSX from 'xlsx/xlsx.mjs'
import { publicFormatter } from '@/utils/dict'; import EnergyQuantityManualAdd from './components/energyQuantityManualAdd'
import { parseTimeTable } from '@/utils/ruoyi'; import moment from 'moment'
import EnergyQuantityManualAdd from './components/energyQuantityManualAdd';
import moment from 'moment';
const tableProps = [ const tableProps = [
{ {
prop: 'energyType', prop: 'energyType',
label: '能源类型', label: '能源类型',
minWidth: 110, minWidth: 110,
filter: publicFormatter('energy_type'), showOverflowtooltip: true
showOverflowtooltip: true, },
}, {
{ prop: 'unit',
prop: 'unit', label: '单位',
label: '单位', filter: publicFormatter('energy_unit'),
filter: publicFormatter('energy_unit'), minWidth: 110
minWidth: 110, },
}, {
{ prop: 'tableName',
prop: 'tableName', label: '能源表名',
label: '能源表名', filter: publicFormatter('table_name'),
filter: publicFormatter('table_name'), minWidth: 110,
minWidth: 110, showOverflowtooltip: true
showOverflowtooltip: true, },
}, {
{ prop: 'recordTime',
prop: 'recordTime', label: '抄表日期',
label: '抄表日期', filter: parseTimeTable('{y}-{m}-{d}'),
filter: parseTimeTable('{y}-{m}-{d}'), minWidth: 110
minWidth: 110, },
}, {
{ prop: 'readingQuantity',
prop: 'readingQuantity', label: '抄表值'
label: '抄表值', },
}, {
{ prop: 'useQty',
prop: 'useQty', label: '差值'
label: '差值', }
}, ]
];
export default { export default {
name: 'EnergyQuantityManual', name: "EnergyQuantityManual",
data() { data() {
return { return {
formConfig: [ formConfig: [
{ {
type: 'select', type: 'select',
label: '能源类型', label: '能源类型',
labelField: 'labelName', selectOptions: [],
selectOptions: [], param: 'energyTypeId',
param: 'energyTypeId', filterable: true
filterable: true, },
}, {
{ type: 'datePicker',
type: 'datePicker', label: '抄表日期',
label: '抄表日期', dateType: 'daterange',
dateType: 'daterange', format: 'yyyy-MM-dd',
format: 'yyyy-MM-dd', valueFormat: "timestamp",
valueFormat: 'timestamp', rangeSeparator: '-',
rangeSeparator: '-', startPlaceholder: '开始时间',
startPlaceholder: '开始时间', endPlaceholder: '结束时间',
endPlaceholder: '结束时间', param: 'timeVal',
param: 'timeVal', defaultSelect: []
defaultSelect: [], },
}, {
{ type: 'button',
type: 'button', btnName: '查询',
btnName: '查询', name: 'search',
name: 'search', color: 'primary'
color: 'primary', },
}, {
{ type: 'separate'
type: 'separate', },
}, {
{ type: this.$auth.hasPermi('base:energy-quantity-manual:export') ? 'button' : '',
type: this.$auth.hasPermi('base:energy-quantity-manual:export') btnName: '导出',
? 'button' name: 'export',
: '', color: 'primary',
btnName: '导出', plain: true
name: 'export', },
color: 'primary', {
plain: true, type: this.$auth.hasPermi('base:energy-quantity-manual:create') ? 'button' : '',
}, btnName: '新增',
{ name: 'add',
type: this.$auth.hasPermi('base:energy-quantity-manual:create') color: 'success',
? 'button' plain: true
: '', }
btnName: '新增', ],
name: 'add', tableProps,
color: 'success', tableH: this.tableHeight(260),
plain: true, //
}, total: 0,
], //
tableProps, list: [],
tableH: this.tableHeight(260), tableBtn: [
// this.$auth.hasPermi('base:energy-quantity-manual:create')
total: 0, ? {
// type: 'meterReading',
list: [], btnName: '抄表'
tableBtn: [ }
this.$auth.hasPermi('base:energy-quantity-manual:create') : undefined,
? { this.$auth.hasPermi('base:energy-quantity-manual:update')
type: 'meterReading', ? {
btnName: '抄表', type: 'edit',
} btnName: '编辑'
: undefined, }
this.$auth.hasPermi('base:energy-quantity-manual:update') : undefined,
? { this.$auth.hasPermi('base:energy-quantity-manual:delete')
type: 'edit', ? {
btnName: '编辑', type: 'delete',
} btnName: '删除'
: undefined, }
this.$auth.hasPermi('base:energy-quantity-manual:delete') : undefined
? { ].filter((v) => v),
type: 'delete', //
btnName: '删除', queryParams: {
} pageNo: 1,
: undefined, pageSize: 20,
].filter((v) => v), energyTypeId: '',
// recordTime: []
queryParams: { },
pageNo: 1, energyTypeList: [],
pageSize: 20, exportList: [],
energyTypeId: '', addOrEditTitle: '',
recordTime: [], centervisible: false,
},
energyTypeList: [], };
exportList: [], },
addOrEditTitle: '', components: { EnergyQuantityManualAdd },
centervisible: false, created() {
}; window.addEventListener('resize', () => {
}, this.tableH = this.tableHeight(260)
components: { EnergyQuantityManualAdd }, })
created() { let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
window.addEventListener('resize', () => { let start = moment(moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')).valueOf()
this.tableH = this.tableHeight(260); this.formConfig[1].defaultSelect = [start, end]
}); this.queryParams.recordTime[0] = start
let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf(); this.queryParams.recordTime[1] = end
let start = moment( this.getList();
moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00') this.getTypeList()
).valueOf(); },
this.formConfig[1].defaultSelect = [start, end]; methods: {
this.queryParams.recordTime[0] = start; buttonClick(val) {
this.queryParams.recordTime[1] = end; this.queryParams.pageNo = 1;
this.getList(); this.queryParams.energyTypeId = val.energyTypeId
this.getTypeList(); this.queryParams.recordTime[0] = val.timeVal ? moment(moment(val.timeVal[0]).format('YYYY-MM-DD 00:00:00')).valueOf() : null
}, this.queryParams.recordTime[1] = val.timeVal ? moment(moment(val.timeVal[1]).format('YYYY-MM-DD 23:59:59')).valueOf() : null
methods: { switch (val.btnName) {
buttonClick(val) { case 'search':
this.queryParams.pageNo = 1; this.getList()
this.queryParams.energyTypeId = val.energyTypeId; break
this.queryParams.recordTime[0] = val.timeVal case 'add':
? moment(moment(val.timeVal[0]).format('YYYY-MM-DD 00:00:00')).valueOf() this.addOrEditTitle = '新增'
: null; this.centervisible = true
this.queryParams.recordTime[1] = val.timeVal let params = {}
? moment(moment(val.timeVal[1]).format('YYYY-MM-DD 23:59:59')).valueOf() params.type = 'add'
: null; this.$nextTick(() => {
switch (val.btnName) { this.$refs.energyQuantityManualAdd.init(params)
case 'search': })
this.getList(); break
break; default:
case 'add': this.$modal.confirm('是否确认导出').then(() => {
this.addOrEditTitle = '新增'; return energyQuantityManualExport({ energyTypeId: this.queryParams.energyTypeId, recordTime: this.queryParams.recordTime });
this.centervisible = true; }).then(response => {
let params = {}; this.$download.excel(response, '能源报表.xls');
params.type = 'add'; }).catch(() => { })
this.$nextTick(() => { }
this.$refs.energyQuantityManualAdd.init(params); },
}); /** 查询列表 */
break; getList() {
default: energyQuantityManualPage(this.queryParams).then(response => {
this.$modal let arr = response.data.list || []
.confirm('是否确认导出') arr && arr.map(item => {
.then(() => { item.amount = item.amount ? (!isNaN(parseFloat(item.amount)) && isFinite(item.amount) ? item.amount.toFixed(2) : '') : ''
return energyQuantityManualExport({ })
energyTypeId: this.queryParams.energyTypeId, this.list = arr
recordTime: this.queryParams.recordTime, this.total = response.data.total;
}); this.exportList = []
}) });
.then((response) => { },
this.$download.excel(response, '能源报表.xls'); getTypeList() {
}) getEnergyTypeListAll().then((res) => {
.catch(() => {}); this.formConfig[0].selectOptions = res.data || []
} this.energyTypeList = res.data || []
}, })
/** 查询列表 */ },
getList() { selectChange(val) {
energyQuantityManualPage(this.queryParams).then((response) => { console.log(val)
let arr = response.data.list || []; this.exportList = val
arr && },
arr.map((item) => { handleClick(val) {
item.amount = item.amount console.log(val)
? !isNaN(parseFloat(item.amount)) && isFinite(item.amount) switch (val.type) {
? item.amount.toFixed(2) case 'edit':
: '' this.addOrEditTitle = '编辑'
: ''; this.centervisible = true
}); let paramA = {}
this.list = arr; paramA.type = 'edit'
this.total = response.data.total; paramA.id = val.data.id
this.exportList = []; this.$nextTick(() => {
}); this.$refs.energyQuantityManualAdd.init(paramA)
}, })
getTypeList() { break
getEnergyTypeListAll().then((res) => { case 'meterReading':
this.formConfig[0].selectOptions = res.data || []; this.addOrEditTitle = '新增'
this.energyTypeList = res.data || []; this.centervisible = true
}); let paramB = {}
}, paramB.type = 'meterReading'
selectChange(val) { paramB.energyTypeId = val.data.energyTypeId
console.log(val); paramB.tableName = val.data.tableName
this.exportList = val; this.$nextTick(() => {
}, this.$refs.energyQuantityManualAdd.init(paramB)
handleClick(val) { })
console.log(val); break
switch (val.type) { default:
case 'edit': this.handleDelete(val.data)
this.addOrEditTitle = '编辑'; }
this.centervisible = true; },
let paramA = {}; //
paramA.type = 'edit'; handleCancel() {
paramA.id = val.data.id; this.$refs.energyQuantityManualAdd.formClear()
this.$nextTick(() => { this.centervisible = false
this.$refs.energyQuantityManualAdd.init(paramA); this.addOrEditTitle = ''
}); },
break; handleConfirm() {
case 'meterReading': this.$refs.energyQuantityManualAdd.submitForm()
this.addOrEditTitle = '新增'; },
this.centervisible = true; successSubmit() {
let paramB = {}; this.handleCancel()
paramB.type = 'meterReading'; this.getList()
paramB.energyTypeId = val.data.energyTypeId; },
paramB.tableName = val.data.tableName; /** 删除按钮操作 */
this.$nextTick(() => { handleDelete(row) {
this.$refs.energyQuantityManualAdd.init(paramB); console.log(row.id)
}); this.$modal.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?').then(function () {
break; return energyQuantityManualDelete({ id: row.id });
default: }).then(() => {
this.handleDelete(val.data); this.queryParams.pageNo = 1;
} this.getList();
}, this.$modal.msgSuccess("删除成功");
// }).catch(() => { });
handleCancel() { }
this.$refs.energyQuantityManualAdd.formClear(); }
this.centervisible = false;
this.addOrEditTitle = '';
},
handleConfirm() {
this.$refs.energyQuantityManualAdd.submitForm();
},
successSubmit() {
this.handleCancel();
this.getList();
},
/** 删除按钮操作 */
handleDelete(row) {
console.log(row.id);
this.$modal
.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?')
.then(function () {
return energyQuantityManualDelete({ id: row.id });
})
.then(() => {
this.queryParams.pageNo = 1;
this.getList();
this.$modal.msgSuccess('删除成功');
})
.catch(() => {});
},
},
}; };
</script> </script>

View File

@ -1,76 +0,0 @@
<template>
<el-form
ref="form"
label-width="100px"
:model="form">
<el-form-item
label="能源类型"
prop="energyType">
<el-input v-model="form.energyType"></el-input>
</el-form-item>
<el-form-item
label="能源表名"
prop="tableIds">
<el-select
v-model="form.tableIds"
placeholder="请选择"
style="width: 100%"
:multiple="true"
filterable>
<el-option
v-for="dict in getDictDatas('table_name')"
:key="dict.id"
:label="dict.label"
:value="dict.id" />
</el-select>
</el-form-item>
</el-form>
</template>
<script>
import {
energyTableGet,
energyTableUpdate,
} from '@/api/base/energyQuantityManual';
export default {
name: 'TableNameConfigUpdate',
data() {
return {
form: {
energyType: '',
energyTypeId: '',
tableIds: [],
},
};
},
methods: {
init(id) {
energyTableGet({ energyTypeId: id }).then((res) => {
this.form.energyType = res.data.energyType || '';
this.form.energyTypeId = res.data.energyTypeId || '';
this.form.tableIds =
res.data.tableObjs &&
res.data.tableObjs.map((item) => {
return item.id;
});
});
},
submitForm() {
this.$refs['form'].validate((valid) => {
//
energyTableUpdate({ ...this.form }).then((res) => {
if (res.code === 0) {
this.$modal.msgSuccess('操作成功');
this.$emit('successSubmit');
}
});
});
},
formClear() {
this.form.energyType = '';
this.form.energyTypeId = '';
this.form.tableIds = [];
this.isEdit = false;
},
},
};
</script>

View File

@ -1,106 +0,0 @@
<template>
<div class="app-container">
<!-- 列表 -->
<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="80"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
</base-table>
<!-- 新增 -->
<base-dialog
dialogTitle="编辑"
:dialogVisible="centervisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel">
<table-name-config-update
ref="tableNameConfigU"
@successSubmit="successSubmit" />
</base-dialog>
</div>
</template>
<script>
import { energyTablePage } from '@/api/base/energyQuantityManual';
import { publicFormatter } from '@/utils/dict';
import tableNameConfigUpdate from './components/tableNameConfigUpdate.vue';
const tableProps = [
{
prop: 'energyType',
label: '能源类型',
width: 200,
filter: publicFormatter('energy_type'),
},
{
prop: 'tableName',
label: '能源表名',
},
];
export default {
name: 'TableNameConfig',
components: { tableNameConfigUpdate },
data() {
return {
tableProps,
tableBtn: [
this.$auth.hasPermi('base:table-name-config:edit')
? {
type: 'edit',
btnName: '编辑',
}
: undefined,
].filter((v) => v),
list: [],
queryParams: {
pageNo: 1,
pageSize: 100,
},
tableH: this.tableHeight(165),
centervisible: false,
};
},
created() {
this.getList();
},
methods: {
getList() {
energyTablePage({ ...this.queryParams }).then((res) => {
let temp = res.data.list || [];
this.list = temp.map((item) => {
return {
energyType: item.energyType,
energyTypeId: item.energyTypeId,
tableName: item.tables.join('、'),
};
});
});
},
handleClick(val) {
console.log('编辑');
this.centervisible = true;
this.$nextTick(() => {
this.$refs.tableNameConfigU.init(val.data.energyTypeId);
});
},
handleCancel() {
this.$refs.tableNameConfigU.formClear();
this.centervisible = false;
},
handleConfirm() {
this.$refs.tableNameConfigU.submitForm();
},
successSubmit() {
this.handleCancel();
this.getList();
},
},
};
</script>

View File

@ -33,28 +33,11 @@
v-model="objIds" v-model="objIds"
:options="objList" :options="objList"
:props="{ checkStrictly: true, value: 'id', label: 'name' }" :props="{ checkStrictly: true, value: 'id', label: 'name' }"
popper-class="cascaderParent"
@change="selectObj" @change="selectObj"
clearable></el-cascader> clearable></el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item
label="监控能源类型"
prop="energyTypeId">
<el-select
v-model="form.energyTypeId"
placeholder="请选择"
style="width: 100%"
filterable
@change="toggleType">
<el-option
v-for="item in this.energyTypeList"
:key="item.id"
:label="item.labelName"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col <el-col
:span="12" :span="12"
v-if="form.method == 2"> v-if="form.method == 2">
@ -73,6 +56,24 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item
label="监控能源类型"
prop="energyTypeId">
<el-select
v-model="form.energyTypeId"
placeholder="请选择"
style="width: 100%"
filterable
@change="toggleType">
<el-option
v-for="item in this.energyTypeList"
:key="item.id"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col <el-col
:span="12" :span="12"
v-if="form.method == 1"> v-if="form.method == 1">
@ -352,3 +353,8 @@ export default {
}, },
}; };
</script> </script>
<style>
.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
display: none;
}
</style>

View File

@ -48,7 +48,7 @@ import {
deleteEnergyLimit, deleteEnergyLimit,
} from '@/api/monitoring/energyLimit'; } from '@/api/monitoring/energyLimit';
import { getEnergyTypeListAll } from '@/api/base/energyType'; import { getEnergyTypeListAll } from '@/api/base/energyType';
import { getTree } from '@/api/analysis/energyAnalysis'; import { getTree } from '@/api/base/factory';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import EnergyLimitAdd from './components/energyLimitAdd'; import EnergyLimitAdd from './components/energyLimitAdd';
const tableProps = [ const tableProps = [
@ -60,27 +60,20 @@ const tableProps = [
{ {
prop: 'objName', prop: 'objName',
label: '监控对象', label: '监控对象',
minWidth: 100,
showOverflowtooltip: true,
}, },
{ {
prop: 'objCode', prop: 'objCode',
label: '对象编码', label: '对象编码',
minWidth: 140,
showOverflowtooltip: true,
}, },
{ {
prop: 'tableName', prop: 'tableName',
label: '能源表名', label: '能源表名',
filter: publicFormatter('table_name'), filter: publicFormatter('table_name'),
minWidth: 120,
showOverflowtooltip: true,
}, },
{ {
prop: 'energyType', prop: 'energyType',
label: '能源类型', label: '能源类型',
filter: publicFormatter('energy_type'), filter: publicFormatter('energy_type'),
showOverflowtooltip: true,
}, },
{ {
prop: 'type', prop: 'type',
@ -111,7 +104,6 @@ export default {
type: 'select', type: 'select',
label: '能源类型', label: '能源类型',
selectOptions: [], selectOptions: [],
labelField: 'labelName',
param: 'energyTypeId', param: 'energyTypeId',
}, },
{ {

View File

@ -1,271 +1,248 @@
<template> <template>
<div class="app-container energyOverlimitLog"> <div class="app-container energyOverlimitLog">
<!-- 搜索工作栏 -->
<search-bar <!-- 搜索工作栏 -->
:formConfigs="formConfig" <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
ref="searchBarForm" <el-tabs v-model="activeName" @tab-click="toggleTab">
@headBtnClick="buttonClick" /> <el-tab-pane label="自动抄表" name="auto"></el-tab-pane>
<el-tabs <el-tab-pane label="手动抄表" name="manual"></el-tab-pane>
v-model="activeName" </el-tabs>
@tab-click="toggleTab"> <!-- 列表 -->
<el-tab-pane <div v-if="activeName === 'auto'">
label="自动抄表" <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
name="auto"></el-tab-pane> :max-height="tableH" />
<el-tab-pane </div>
label="手动抄表" <div v-if="activeName === 'manual'">
name="manual"></el-tab-pane> <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps2"
</el-tabs> :table-data="list2" :max-height="tableH" />
<!-- 列表 --> </div>
<div v-if="activeName === 'auto'"> <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
<base-table @pagination="getList" />
:page="queryParams.pageNo" </div>
:limit="queryParams.pageSize"
:table-props="tableProps"
:table-data="list"
:max-height="tableH" />
</div>
<div v-if="activeName === 'manual'">
<base-table
:page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-props="tableProps2"
:table-data="list2"
:max-height="tableH" />
</div>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList" />
</div>
</template> </template>
<script> <script>
import { getEnergyOverlimitLogPage } from '@/api/monitoring/energyOverlimitLog'; import { getEnergyOverlimitLogPage } from "@/api/monitoring/energyOverlimitLog";
import { getEnergyTypeListAll } from '@/api/base/energyType'; import { getEnergyTypeListAll } from "@/api/base/energyType";
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict'
import { parseTime } from '@/utils/ruoyi'; import { parseTime } from '@/utils/ruoyi'
const tableProps = [ const tableProps = [
{ {
prop: 'objName', prop: 'objName',
label: '监控对象', label: '监控对象'
}, },
{ {
prop: 'objCode', prop: 'objCode',
label: '对象编码', label: '对象编码'
}, },
{ {
prop: 'energyType', prop: 'energyType',
label: '能源类型', label: '能源类型'
filter: publicFormatter('energy_type'), },
}, {
{ prop: 'type',
prop: 'type', label: '监控模式'
label: '监控模式', },
}, {
{ prop: 'paramName',
prop: 'paramName', label: '监控参数'
label: '监控参数', },
}, {
{ prop: 'limitType',
prop: 'limitType', label: '指标类型',
label: '指标类型', filter: publicFormatter('monitor_index_type')
filter: publicFormatter('monitor_index_type'), },
}, {
{ prop: 'realityValue',
prop: 'realityValue', label: '实际值'
label: '实际值', },
}, {
{ prop: 'limitValue',
prop: 'limitValue', label: '阈值'
label: '阈值', },
}, {
{ prop: 'overValue',
prop: 'overValue', label: '超出值'
label: '超出值', },
}, {
{ prop: 'time',
prop: 'time', label: '提醒时间',
label: '提醒时间', filter: parseTime,
filter: parseTime, minWidth: 160
minWidth: 160, }
}, ]
];
const tableProps2 = [ const tableProps2 = [
{ {
prop: 'energyType', prop: 'energyType',
label: '能源类型', label: '能源类型'
filter: publicFormatter('energy_type'), },
}, {
{ prop: 'limitType',
prop: 'limitType', label: '指标类型',
label: '指标类型', filter: publicFormatter('monitor_index_type')
filter: publicFormatter('monitor_index_type'), },
}, {
{ prop: 'realityValue',
prop: 'realityValue', label: '实际值'
label: '实际值', },
}, {
{ prop: 'limitValue',
prop: 'limitValue', label: '阈值'
label: '阈值', },
}, {
{ prop: 'overValue',
prop: 'overValue', label: '超出值'
label: '超出值', },
}, {
{ prop: 'time',
prop: 'time', label: '提醒时间',
label: '提醒时间', filter: parseTime,
filter: parseTime, minWidth: 160
minWidth: 160, }
}, ]
];
export default { export default {
name: 'EnergyOverlimitLog', name: "EnergyOverlimitLog",
data() { data() {
return { return {
formConfig: [ formConfig: [
{ {
type: 'select', type: 'select',
label: '能源类型', label: '能源类型',
labelField: 'labelName', selectOptions: [],
selectOptions: [], param: 'energyTypeId'
param: 'energyTypeId', },
}, {
{ type: 'select',
type: 'select', label: '指标类型',
label: '指标类型', selectOptions: this.getDictDatas(this.DICT_TYPE.MONITOR_INDEX_TYPE),
selectOptions: this.getDictDatas(this.DICT_TYPE.MONITOR_INDEX_TYPE), labelField: 'label',
labelField: 'label', valueField: 'value',
valueField: 'value', param: 'indexType'
param: 'indexType', },
}, {
{ type: 'button',
type: 'button', btnName: '查询',
btnName: '查询', name: 'search',
name: 'search', color: 'primary'
color: 'primary', }
}, ],
], activeName: 'auto',
activeName: 'auto', tableProps,
tableProps, tableProps2,
tableProps2, tableH: this.tableHeight(260),
tableH: this.tableHeight(260), total: 0,
total: 0, list: [],
list: [], list2: [],
list2: [], //
// queryParams: {
queryParams: { pageNo: 1,
pageNo: 1, pageSize: 20,
pageSize: 20, energyTypeId: '',
energyTypeId: '', indexType: '',
indexType: '', method: '1'
method: '1', },
}, typeList: [
typeList: [ { id: 1, name: '合并' },
{ id: 1, name: '合并' }, { id: 2, name: '详细' }
{ id: 2, name: '详细' }, ]
], };
}; },
}, created() {
created() { window.addEventListener('resize', () => {
window.addEventListener('resize', () => { this.tableH = this.tableHeight(260)
this.tableH = this.tableHeight(260); })
}); this.getList();
this.getList(); this.getTypeList()
this.getTypeList(); },
}, methods: {
methods: { buttonClick(val) {
buttonClick(val) { this.queryParams.pageNo = 1;
this.queryParams.pageNo = 1; this.queryParams.energyTypeId = val.energyTypeId
this.queryParams.energyTypeId = val.energyTypeId; this.queryParams.indexType = val.indexType
this.queryParams.indexType = val.indexType; this.getList()
this.getList(); },
}, /** 查询列表 */
/** 查询列表 */ getList() {
getList() { getEnergyOverlimitLogPage(this.queryParams).then(response => {
getEnergyOverlimitLogPage(this.queryParams).then((response) => { let arr = response.data.list || [];
let arr = response.data.list || []; arr && arr.map((item) => {
arr && this.typeList.map((i) => {
arr.map((item) => { if (item.type === i.id) {
this.typeList.map((i) => { item.type = i.name
if (item.type === i.id) { }
item.type = i.name; })
} if (item.minValue && item.maxValue) {
}); item.limitValue = item.minValue + '-' + item.maxValue
if (item.minValue && item.maxValue) { } else if (item.minValue) {
item.limitValue = item.minValue + '-' + item.maxValue; item.limitValue = '最小值' + item.minValue
} else if (item.minValue) { } else if (item.maxValue) {
item.limitValue = '最小值' + item.minValue; item.limitValue = '最大值' + item.maxValue
} else if (item.maxValue) { } else {
item.limitValue = '最大值' + item.maxValue; item.limitValue = ''
} else { }
item.limitValue = ''; })
} if (this.queryParams.method === '1') {
}); this.list = arr
if (this.queryParams.method === '1') { this.list2 = []
this.list = arr; } else {
this.list2 = []; this.list2 = arr
} else { this.list1 = []
this.list2 = arr; }
this.list1 = []; this.total = response.data.total;
} });
this.total = response.data.total; },
}); getTypeList() {
}, getEnergyTypeListAll().then((res) => {
getTypeList() { console.log(res)
getEnergyTypeListAll().then((res) => { this.formConfig[0].selectOptions = res.data || []
console.log(res); })
this.formConfig[0].selectOptions = res.data || []; },
}); toggleTab() {
}, if (this.activeName === 'auto') {
toggleTab() { this.queryParams.method = '1'
if (this.activeName === 'auto') { } else {
this.queryParams.method = '1'; this.queryParams.method = '2'
} else { }
this.queryParams.method = '2'; this.queryParams.pageNo = 1
} this.getList()
this.queryParams.pageNo = 1; }
this.getList(); }
},
},
}; };
</script> </script>
<style lang='scss'> <style lang='scss'>
.energyOverlimitLog { .energyOverlimitLog {
.el-tabs__nav::after { .el-tabs__nav::after {
content: ''; content: "";
position: absolute; position: absolute;
left: 0; left: 0;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 2px; height: 2px;
background-color: #e4e7ed; background-color: #e4e7ed;
} }
.el-tabs__nav-wrap::after { .el-tabs__nav-wrap::after {
width: 0; width: 0;
} }
.el-tabs__item { .el-tabs__item {
padding: 0 10px; padding: 0 10px;
} }
.el-tabs__item:hover { .el-tabs__item:hover {
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
} }
.el-tabs__item.is-active { .el-tabs__item.is-active {
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
} }
.el-tabs__item { .el-tabs__item {
color: rgba(0, 0, 0, 0.45); color: rgba(0, 0, 0, 0.45);
} }
.searchBarBox { .searchBarBox {
margin-bottom: 0; margin-bottom: 0;
} }
} }
</style> </style>

View File

@ -56,7 +56,6 @@ const tableProps = [
{ {
prop: 'energyType', prop: 'energyType',
label: '能源类型', label: '能源类型',
filter: publicFormatter('energy_type'),
}, },
{ {
prop: 'startNum', prop: 'startNum',
@ -80,7 +79,6 @@ export default {
{ {
type: 'select', type: 'select',
label: '能源类型', label: '能源类型',
labelField: 'labelName',
selectOptions: [], selectOptions: [],
param: 'energyTypeId', param: 'energyTypeId',
filterable: true, filterable: true,

View File

@ -1,160 +1,128 @@
<template> <template>
<el-form <el-form ref="form" :rules="rules" label-width="100px" :model="form">
ref="form" <el-row>
:rules="rules" <el-col :span="12">
label-width="100px" <el-form-item label="方案名称" prop="name">
:model="form"> <el-input v-model="form.name"></el-input>
<el-row> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item <el-col :span="12">
label="方案名称" <el-form-item label="方案编码" prop="code">
prop="name"> <el-input v-model="form.code" disabled></el-input>
<el-input v-model="form.name"></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> </el-row>
<el-col :span="12"> <el-row>
<el-form-item <el-col :span="12">
label="方案编码" <el-form-item label="统计类型" prop="type">
prop="code"> <el-select v-model="form.type" placeholder="请选择" style="width: 100%;">
<el-input <el-option
v-model="form.code" v-for="item in getDictDatas(DICT_TYPE.STATISTIC_TYPE)"
disabled></el-input> :key="item.value"
</el-form-item> :label="item.label"
</el-col> :value="item.value">
</el-row> </el-option>
<el-row> </el-select>
<el-col :span="12"> </el-form-item>
<el-form-item </el-col>
label="统计类型" <el-col :span="12">
prop="type"> <el-form-item label="能源类型" prop="energyTypeId">
<el-select <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
v-model="form.type" <el-option
placeholder="请选择" v-for="item in energyListType"
style="width: 100%"> :key="item.id"
<el-option :label="item.name"
v-for="item in getDictDatas(DICT_TYPE.STATISTIC_TYPE)" :value="item.id">
:key="item.value" </el-option>
:label="item.label" </el-select>
:value="item.value"></el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
</el-col> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="备注" prop="remark">
label="能源类型" <el-input v-model="form.remark"></el-input>
prop="energyTypeId"> </el-form-item>
<el-select </el-col>
v-model="form.energyTypeId" </el-row>
placeholder="请选择" </el-form>
style="width: 100%"
filterable>
<el-option
v-for="item in energyListType"
:key="item.id"
:label="item.labelName"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item
label="备注"
prop="remark">
<el-input v-model="form.remark"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template> </template>
<script> <script>
import { import { getCode, createEnergyStatistics, updateEnergyStatistics, getEnergyStatistics } from "@/api/monitoring/energyStatistics";
getCode, import { getEnergyTypeListAll } from '@/api/base/energyType'
createEnergyStatistics,
updateEnergyStatistics,
getEnergyStatistics,
} from '@/api/monitoring/energyStatistics';
import { getEnergyTypeListAll } from '@/api/base/energyType';
import { number } from 'echarts'; import { number } from 'echarts';
export default { export default {
name: 'EnergyStatisticsAdd', name: 'EnergyStatisticsAdd',
data() { data() {
return { return {
form: { form: {
id: '', id: '',
name: '', name: '',
code: '', code: '',
type: '', type: '',
energyTypeId: '', energyTypeId: ''
}, },
plcList: [], plcList: [],
objList: [], objList: [],
isEdit: false, // isEdit: false, //
rules: { rules: {
name: [ name: [{ required: true, message: '方案名称不能为空', trigger: 'blur' }],
{ required: true, message: '方案名称不能为空', trigger: 'blur' }, type: [{ required: true, message: '统计类型不能为空', trigger: 'change' }],
], energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }]
type: [ },
{ required: true, message: '统计类型不能为空', trigger: 'change' }, energyListType: [],
], }
energyTypeId: [ },
{ required: true, message: '能源类型不能为空', trigger: 'change' }, methods: {
], init(id) {
}, getEnergyTypeListAll().then((res) => {
energyListType: [], this.energyListType = res.data || []
}; })
}, if (id) {
methods: { this.isEdit = true
init(id) { this.form.id = id
getEnergyTypeListAll().then((res) => { getEnergyStatistics( id ).then((res) => {
this.energyListType = res.data || []; if (res.code === 0) {
}); this.form = res.data
if (id) { this.form.type = this.form.type + ''
this.isEdit = true; }
this.form.id = id; })
getEnergyStatistics(id).then((res) => { } else {
if (res.code === 0) { getCode().then((res) => {
this.form = res.data; this.form.code = res.data
this.form.type = this.form.type + ''; })
} this.isEdit = false
}); this.form.id = ''
} else { }
getCode().then((res) => { },
this.form.code = res.data; submitForm() {
}); this.$refs['form'].validate((valid) => {
this.isEdit = false; if (valid) {
this.form.id = ''; if (this.isEdit) {
} //
}, updateEnergyStatistics({...this.form}).then((res) => {
submitForm() { if (res.code === 0) {
this.$refs['form'].validate((valid) => { this.$modal.msgSuccess("操作成功");
if (valid) { this.$emit('successSubmit')
if (this.isEdit) { }
// })
updateEnergyStatistics({ ...this.form }).then((res) => { } else {
if (res.code === 0) { createEnergyStatistics({...this.form}).then((res) => {
this.$modal.msgSuccess('操作成功'); if (res.code === 0) {
this.$emit('successSubmit'); this.$modal.msgSuccess("操作成功");
} this.$emit('successSubmit')
}); }
} else { })
createEnergyStatistics({ ...this.form }).then((res) => { }
if (res.code === 0) { } else {
this.$modal.msgSuccess('操作成功'); return false
this.$emit('successSubmit'); }
} })
}); },
} formClear() {
} else { this.$refs.form.resetFields()
return false; this.isEdit = false
} }
}); }
}, }
formClear() {
this.$refs.form.resetFields();
this.isEdit = false;
},
},
};
</script> </script>

View File

@ -1,254 +1,222 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<search-bar <!-- 搜索工作栏 -->
:formConfigs="formConfig" <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
ref="searchBarForm" <!-- 列表 -->
@headBtnClick="buttonClick" /> <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
<!-- 列表 --> :max-height="tableH">
<base-table <method-btn v-if="tableBtn.length" slot="handleBtn" :width="160" label="操作" :method-list="tableBtn"
:page="queryParams.pageNo" @clickBtn="handleClick" />
:limit="queryParams.pageSize" </base-table>
:table-props="tableProps" <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
:table-data="list" @pagination="getList" />
:max-height="tableH"> <!-- 新增 -->
<method-btn <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
v-if="tableBtn.length" @confirm="handleConfirm" :before-close="handleCancel">
slot="handleBtn" <energy-statistics-add ref="energyStatistics" @successSubmit="successSubmit" />
:width="160" </base-dialog>
label="操作" <!-- 参数绑定/查看 -->
:method-list="tableBtn" <energy-statistics-det ref="plcParam" @closeDrawer="closeDrawer"
@clickBtn="handleClick" /> :energyTypeList="energyTypeList"></energy-statistics-det>
</base-table> </div>
<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">
<energy-statistics-add
ref="energyStatistics"
@successSubmit="successSubmit" />
</base-dialog>
<!-- 参数绑定/查看 -->
<energy-statistics-det
ref="plcParam"
@closeDrawer="closeDrawer"
:energyTypeList="energyTypeList"></energy-statistics-det>
</div>
</template> </template>
<script> <script>
import { import { getEnergyStatisticsPage, deleteEnergyStatistics } from "@/api/monitoring/energyStatistics";
getEnergyStatisticsPage, import { publicFormatter } from '@/utils/dict'
deleteEnergyStatistics, import { getEnergyTypeListAll } from '@/api/base/energyType'
} from '@/api/monitoring/energyStatistics'; import EnergyStatisticsAdd from './components/energyStatisticsAdd'
import { publicFormatter } from '@/utils/dict'; import EnergyStatisticsDet from './components/energyStatisticsDet'
import { getEnergyTypeListAll } from '@/api/base/energyType';
import EnergyStatisticsAdd from './components/energyStatisticsAdd';
import EnergyStatisticsDet from './components/energyStatisticsDet';
const tableProps = [ const tableProps = [
{ {
prop: 'name', prop: 'name',
label: '方案名称', label: '方案名称'
}, },
{ {
prop: 'code', prop: 'code',
label: '方案编码', label: '方案编码',
minWidth: 120, minWidth: 120,
showOverflowtooltip: true, showOverflowtooltip: true
}, },
{ {
prop: 'type', prop: 'type',
label: '统计类型', label: '统计类型',
filter: publicFormatter('statistic_type'), filter: publicFormatter('statistic_type')
}, },
{ {
prop: 'energyType', prop: 'energyType',
label: '能源类型', label: '能源类型'
filter: publicFormatter('energy_type'), },
}, {
{ prop: 'paramNum',
prop: 'paramNum', label: '统计参数数量'
label: '统计参数数量', },
}, {
{ prop: 'remark',
prop: 'remark', label: '备注'
label: '备注', }
}, ]
];
export default { export default {
name: 'EnergyStatistics', name: "EnergyStatistics",
components: { EnergyStatisticsAdd, EnergyStatisticsDet }, components: { EnergyStatisticsAdd, EnergyStatisticsDet },
data() { data() {
return { return {
formConfig: [ formConfig: [
{ {
type: 'input', type: 'input',
label: '方案名称', label: '方案名称',
placeholder: '方案名称', placeholder: '方案名称',
param: 'name', param: 'name'
}, },
{ {
type: 'button', type: 'button',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary'
}, },
{ {
type: 'separate', type: 'separate'
}, },
{ {
type: this.$auth.hasPermi('monitoring:energy-statistics:create') type: this.$auth.hasPermi('monitoring:energy-statistics:create') ? 'button' : '',
? 'button' btnName: '新增',
: '', name: 'add',
btnName: '新增', color: 'success',
name: 'add', plain: true
color: 'success', }
plain: true, ],
}, tableProps,
], tableBtn: [
tableProps, this.$auth.hasPermi('monitoring:energy-statistics:bind')
tableBtn: [ ? {
this.$auth.hasPermi('monitoring:energy-statistics:bind') type: 'connect',
? { btnName: '绑定'
type: 'connect', }
btnName: '绑定', : undefined,
} {
: undefined, type: 'detail',
{ btnName: '详情'
type: 'detail', },
btnName: '详情', this.$auth.hasPermi('monitoring:energy-statistics:update')
}, ? {
this.$auth.hasPermi('monitoring:energy-statistics:update') type: 'edit',
? { btnName: '编辑'
type: 'edit', }
btnName: '编辑', : undefined,
} this.$auth.hasPermi('monitoring:energy-statistics:delete')
: undefined, ? {
this.$auth.hasPermi('monitoring:energy-statistics:delete') type: 'delete',
? { btnName: '删除'
type: 'delete', }
btnName: '删除', : undefined
} ].filter((v) => v),
: undefined, tableH: this.tableHeight(260),
].filter((v) => v), //
tableH: this.tableHeight(260), total: 0,
// //
total: 0, list: [],
// //
list: [], addOrEditTitle: "",
// //
addOrEditTitle: '', centervisible: false,
// //
centervisible: false, queryParams: {
// pageNo: 1,
queryParams: { pageSize: 20,
pageNo: 1, name: null
pageSize: 20, },
name: null, energyTypeList: []
}, };
energyTypeList: [], },
}; created() {
}, window.addEventListener('resize', () => {
created() { this.tableH = this.tableHeight(260)
window.addEventListener('resize', () => { })
this.tableH = this.tableHeight(260); this.getList();
}); },
this.getList(); mounted() {
}, //
mounted() { this.getEnergyTypeList()
// },
this.getEnergyTypeList(); methods: {
}, buttonClick(val) {
methods: { switch (val.btnName) {
buttonClick(val) { case 'search':
switch (val.btnName) { this.queryParams.pageNo = 1;
case 'search': this.queryParams.name = val.name
this.queryParams.pageNo = 1; this.getList()
this.queryParams.name = val.name; break
this.getList(); default:
break; this.addOrEditTitle = '新增'
default: this.centervisible = true
this.addOrEditTitle = '新增'; this.$nextTick(() => {
this.centervisible = true; this.$refs.energyStatistics.init()
this.$nextTick(() => { })
this.$refs.energyStatistics.init(); }
}); },
} /** 查询列表 */
}, getList() {
/** 查询列表 */ getEnergyStatisticsPage(this.queryParams).then(response => {
getList() { let arr = response.data.list || [];
getEnergyStatisticsPage(this.queryParams).then((response) => { this.list = arr
let arr = response.data.list || []; this.total = response.data.total;
this.list = arr; });
this.total = response.data.total; },
}); handleClick(val) {
}, console.log(val)
handleClick(val) { switch (val.type) {
console.log(val); case 'edit':
switch (val.type) { this.addOrEditTitle = '编辑'
case 'edit': this.$nextTick(() => {
this.addOrEditTitle = '编辑'; this.$refs.energyStatistics.init(val.data.id)
this.$nextTick(() => { })
this.$refs.energyStatistics.init(val.data.id); this.centervisible = true
}); break
this.centervisible = true; case 'delete':
break; this.handleDelete(val.data)
case 'delete': break
this.handleDelete(val.data); case 'detail':
break; this.$nextTick(() => {
case 'detail': this.$refs.plcParam.init(val.data, 'detail')
this.$nextTick(() => { })
this.$refs.plcParam.init(val.data, 'detail'); break
}); default:
break; this.$nextTick(() => {
default: this.$refs.plcParam.init(val.data, 'connect')
this.$nextTick(() => { })
this.$refs.plcParam.init(val.data, 'connect'); }
}); },
} handleCancel() {
}, this.$refs.energyStatistics.formClear()
handleCancel() { this.centervisible = false
this.$refs.energyStatistics.formClear(); this.addOrEditTitle = ''
this.centervisible = false; },
this.addOrEditTitle = ''; handleConfirm() {
}, this.$refs.energyStatistics.submitForm()
handleConfirm() { },
this.$refs.energyStatistics.submitForm(); successSubmit() {
}, this.handleCancel()
successSubmit() { this.getList()
this.handleCancel(); },
this.getList(); /** 删除按钮操作 */
}, handleDelete(row) {
/** 删除按钮操作 */ this.$modal.confirm('是否确认删除方案名称为"' + row.name + '"的数据项?').then(function () {
handleDelete(row) { return deleteEnergyStatistics(row.id);
this.$modal }).then(() => {
.confirm('是否确认删除方案名称为"' + row.name + '"的数据项?') this.queryParams.pageNo = 1;
.then(function () { this.getList();
return deleteEnergyStatistics(row.id); this.$modal.msgSuccess("删除成功");
}) }).catch(() => { });
.then(() => { },
this.queryParams.pageNo = 1; closeDrawer() {
this.getList(); this.getList()
this.$modal.msgSuccess('删除成功'); },
}) getEnergyTypeList() {
.catch(() => {}); getEnergyTypeListAll().then((res) => {
}, this.energyTypeList = res.data || []
closeDrawer() { })
this.getList(); }
}, }
getEnergyTypeList() {
getEnergyTypeListAll().then((res) => {
this.energyTypeList = res.data || [];
});
},
},
}; };
</script> </script>