xzzn/emsfront
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页看板、电表报表接口联调，部分接口参数更新

Browse Source
This commit is contained in:
白菜
2025-07-09 21:16:54 +08:00
parent b3b4d9c0dc
commit b8827248cb
10 changed files with 159 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/views/ems/dzjk/tjbb/dbbb/index.vue
View File

@ -4,15 +4,15 @@
<!-- 搜索栏-->
<el-form :inline="true" class="select-container">
<el-form-item label="电表">
<el-select v-model="search.db" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
<el-option :label="item.name" :value="item.id" v-for="(item,index) in dbOptions" :key="index+'dbOptions'"></el-option>
</el-select>
</el-form-item>
<el-form-item label="日报">
<el-select v-model="search.rb" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
<el-option :label="item.name" :value="item.id" v-for="(item,index) in rbOptions" :key="index+'rbOptions'"></el-option>
<el-select v-model="search.deviceId" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
<el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in deviceOptions" :key="index+'dbOptions'"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="日报">-->
<!-- <el-select v-model="search.rb" placeholder="请选择" :loading="loading" loading-text="正在加载数据">-->
<!-- <el-option :label="item.name" :value="item.id" v-for="(item,index) in rbOptions" :key="index+'rbOptions'"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="时间选择">
<el-date-picker
v-model="search.date"
@ -41,7 +41,7 @@
<!-- 汇总列-->
<el-table-column label="汇总">
<el-table-column
prop="time"
prop="dateTime"
label="日期"
width="120">
</el-table-column>
@ -49,53 +49,53 @@
<!--充电量列-->
<el-table-column label="充电量">
<el-table-column
prop="cdlJian"
prop="activePeakKwh"
label="尖">
</el-table-column>
<el-table-column
prop="cdlFeng"
prop="activeHighKwh"
label="峰">
</el-table-column>
<el-table-column
prop="cdlPing"
prop="activeFlatKwh"
label="平">
</el-table-column>
<el-table-column
prop="cdlGu"
prop="activeValleyKwh"
label="谷">
</el-table-column>
<el-table-column
prop="cdlZong"
prop="activeTotalKwh"
label="总">
</el-table-column>
</el-table-column>
<!--充电量列-->
<el-table-column label="放电量">
<el-table-column
prop="fdlJian"
prop="reActivePeakKwh"
label="尖">
</el-table-column>
<el-table-column
prop="fdlFeng"
prop="reActiveHighKwh"
label="峰">
</el-table-column>
<el-table-column
prop="fdlPing"
prop="reActiveFlatKwh"
label="平">
</el-table-column>
<el-table-column
prop="fdlGu"
prop="reActiveValleyKwh"
label="谷">
</el-table-column>
<el-table-column
prop="fdlZong"
prop="reActiveTotalKwh"
label="总">
</el-table-column>
</el-table-column>
<!-- 效率-->
<el-table-column label="效率(%)">
<el-table-column
prop="efficiency">
prop="effect">
</el-table-column>
</el-table-column>
</el-table>
@ -104,8 +104,12 @@
<script>
import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
import { getAmmeterData, getLoadNameList} from '@/api/ems/dzjk'
import {formatDate} from "@/filters/ems";
export default {
name:'DzjkTjbbDbbb',
mixins: [getQuerySiteId],
data() {
return {
loading:false,
@ -115,22 +119,13 @@ export default {
},
},
defaultDate:'',//默认展示的时间
search:{db:'',rb:'',date:''},
dbOptions:[
{name:'电表1',id:1},
{name:'电表2',id:2},
{name:'电表3',id:3},
],
rbOptions:[
{name:'日报1',id:1},
{name:'日报2',id:2},
],
tableData:[
{time:'2016-05',cdlJian:10,cdlFeng:20,cdlPing:100,cdlGu:30,cdlZong:100,fdlJian:20,fdlFeng:100,fdlPing:50,fdlGu:100,fdlZong:200,efficiency:80},
{time:'2016-05',cdlJian:10,cdlFeng:20,cdlPing:100,cdlGu:30,cdlZong:100,fdlJian:20,fdlFeng:100,fdlPing:50,fdlGu:100,fdlZong:200,efficiency:80},
{time:'2016-05',cdlJian:10,cdlFeng:20,cdlPing:100,cdlGu:30,cdlZong:100,fdlJian:20,fdlFeng:100,fdlPing:50,fdlGu:100,fdlZong:200,efficiency:80},
{time:'2016-05',cdlJian:10,cdlFeng:20,cdlPing:100,cdlGu:30,cdlZong:100,fdlJian:20,fdlFeng:100,fdlPing:50,fdlGu:100,fdlZong:200,efficiency:80},
]
search:{deviceId:'',date:''},
deviceOptions:[],
// rbOptions:[
// {name:'日报1',id:1},
// {name:'日报2',id:2},
// ],
tableData:[]
}
},
methods:{
@ -140,21 +135,36 @@ export default {
},
// 重置
onReset(){
this.search={
db:'',rb:'',date:''
}
this.search.date = ''
this.getData()
},
// 获取数据
getData(){
this.loading=false
this.loading=true
getAmmeterData({siteId:this.siteId,deviceId:this.search.deviceId,dateTime:formatDate(this.search.date)}).then(response=>{
this.tableData=response?.data || [];
}).finally(()=> {
this.loading = false
})
},
getDbList(){
return getLoadNameList(this.siteId).then(response=>{
this.deviceOptions=response?.data || [];
this.deviceOptions.length > 0 && (this.search.deviceId = this.deviceOptions[0].id);
})
},
init(){
this.loading = true
this.getDbList().then(()=>{
this.onReset()
})
},
getSummaries(){
}
},
mounted(){
this.getData()
this.defaultDate = new Date()
}
}

8
src/views/ems/dzjk/tjbb/dcdqx/index.vue
View File

@ -3,7 +3,7 @@
<div v-loading="loading">
<div class="select-container">
<el-form :inline="true">
<el-form-item label="PCS">
<el-form-item label="电池堆">
<el-select v-model="pcs" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
<el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in pcsOptions" :key="index+'pcsListOptions'"></el-option>
</el-select>
@ -47,7 +47,7 @@
import * as echarts from 'echarts'
import resize from "@/mixins/ems/resize";
import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
import { getStackData, getPcsNameList} from '@/api/ems/dzjk'
import { getStackData, getStackNameList} from '@/api/ems/dzjk'
import {formatDate} from "@/filters/ems";
export default {
name:'DzjkTjbbDcdqx',
@ -91,8 +91,8 @@ export default {
this.getData()
},
getPcsList(){
return getPcsNameList(this.siteId).then(response => {
const data = response?.data || [];
return getStackNameList(this.siteId).then(response => {
const data = JSON.parse(JSON.stringify(response?.data || []))
this.pcsOptions = data
this.pcs = data.length>0?data[0].id:'';
})