|
|
|
@ -38,7 +38,7 @@
|
|
|
|
|
<!-- @keyup.enter.native="handleQuery"-->
|
|
|
|
|
<!-- />-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<el-form-item label="采集时间">
|
|
|
|
|
<!-- <el-form-item label="采集时间">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="daterangeCollectTime"
|
|
|
|
|
style="width: 340px"
|
|
|
|
@ -48,7 +48,7 @@
|
|
|
|
|
start-placeholder="开始时间"
|
|
|
|
|
end-placeholder="结束时间"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-form-item>-->
|
|
|
|
|
<el-form-item label="记录时间">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="daterangeRecordTime"
|
|
|
|
@ -113,6 +113,9 @@
|
|
|
|
|
>导出
|
|
|
|
|
</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
<!-- <el-col :span="3">
|
|
|
|
|
<span v-if="expendSum!==null">耗量:{{expendSum}}</span>
|
|
|
|
|
</el-col>-->
|
|
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
@ -160,6 +163,8 @@
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
|
|
<span v-if="expendSum!==null">耗量:{{expendSum}}</span>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
@ -236,7 +241,7 @@ import {
|
|
|
|
|
getRecordSteamInstant,
|
|
|
|
|
delRecordSteamInstant,
|
|
|
|
|
addRecordSteamInstant,
|
|
|
|
|
updateRecordSteamInstant
|
|
|
|
|
updateRecordSteamInstant, getExpendSum
|
|
|
|
|
} from '@/api/ems/record/recordSteamInstant'
|
|
|
|
|
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
|
|
|
|
|
import Treeselect from '@riophae/vue-treeselect'
|
|
|
|
@ -275,6 +280,8 @@ export default {
|
|
|
|
|
total: 0,
|
|
|
|
|
// 蒸汽历史数据表格数据
|
|
|
|
|
recordSteamInstantList: [],
|
|
|
|
|
//Bigdecimal类型字段
|
|
|
|
|
expendSum: null,
|
|
|
|
|
// 弹出层标题
|
|
|
|
|
title: '',
|
|
|
|
|
// 是否显示弹出层
|
|
|
|
@ -377,6 +384,19 @@ export default {
|
|
|
|
|
this.total = response.total
|
|
|
|
|
this.loading = false
|
|
|
|
|
})
|
|
|
|
|
//如果设备编号、beginRecordTime和endRecordTime不为空,getExpendSum
|
|
|
|
|
if (this.queryParams.monitorCode != null
|
|
|
|
|
&& this.queryParams.params['endRecordTime'] != null
|
|
|
|
|
&& this.queryParams.params['endRecordTime'] != null) {
|
|
|
|
|
getExpendSum(this.queryParams).then(response => {
|
|
|
|
|
//返回的是BigDecimal
|
|
|
|
|
this.expendSum = response;
|
|
|
|
|
/* console.log(response)
|
|
|
|
|
console.log(this.expendSum)
|
|
|
|
|
console.log(response.data)*/
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
// 取消按钮
|
|
|
|
|
cancel() {
|
|
|
|
|