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

优化0918

Browse Source
This commit is contained in:
白菜
2025-09-25 17:58:22 +08:00
parent a0ea6041cc
commit 1f49a3af20
2 changed files with 84 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/ems/dzjk/home/index.vue
View File

@ -110,6 +110,14 @@ export default {
title: "今日放电量（kWh）", title: "今日放电量（kWh）",
attr: "dayDisChargedCap", attr: "dayDisChargedCap",
}, },
{
title: "总收入",
attr: "todo",
},
{
title: "当日实时收入",
attr: "todo",
},
{ {
title: "总充电量（MWh）", title: "总充电量（MWh）",
attr: "totalChargedCap", attr: "totalChargedCap",
@ -118,6 +126,7 @@ export default {
title: "总放电量（MWh）", title: "总放电量（MWh）",
attr: "totalDischargedCap", attr: "totalDischargedCap",
}, },
], ],
info: {}, //基本信息 info: {}, //基本信息
runningInfo: {}, //总累计运行数据+报警表格 runningInfo: {}, //总累计运行数据+报警表格

152
src/views/ems/dzjk/sbjk/db/index.vue
View File

@ -1,76 +1,78 @@
<template> <template>
<div v-loading="loading"> <div v-loading="loading">
<el-card <template v-for="(item,index) in list">
shadow="always" <el-card
class="sbjk-card-container" shadow="always"
:class="{ class="sbjk-card-container"
'warning-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0', :class="{
'running-card-container':zbInfo.emsCommunicationStatus === '0' 'warning-card-container':item.ammeterLoadData.emsCommunicationStatus && item.ammeterLoadData.emsCommunicationStatus !== '0',
'running-card-container':item.ammeterLoadData.emsCommunicationStatus === '0'
}" }"
> >
<div slot="header"> <div slot="header">
<span class="large-title">1#{{ zbInfo.deviceName }}</span> <span class="large-title">{{ item.ammeterLoadData.deviceName }}</span>
<div class="info"> <div class="info">
<div> <div>
{{ {{
$store.state.ems.communicationStatusOptions[ $store.state.ems.communicationStatusOptions[
zbInfo.emsCommunicationStatus item.ammeterLoadData.emsCommunicationStatus
] ]
}} }}
</div> </div>
<div>数据更新时间：{{ zbInfo.dataUpdateTime }}</div> <div>数据更新时间：{{ item.ammeterLoadData.dataUpdateTime }}</div>
</div> </div>
</div> </div>
<el-table <el-table
class="common-table" class="common-table"
:data="zbInfo.loadDataDetailInfo" :data="item.ammeterLoadData.loadDataDetailInfo"
@cell-click="(row,col)=>{handlerCell(zbInfo.deviceId,row,col)}" @cell-click="(row,col)=>{handlerCell(item.ammeterLoadData.deviceId,row,col)}"
stripe stripe
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="category" label="类别"> </el-table-column> <el-table-column prop="category" label="类别"> </el-table-column>
<el-table-column prop="totalKwh" label="总/kWh"> </el-table-column> <el-table-column prop="totalKwh" label="总/kWh"> </el-table-column>
<el-table-column prop="peakKwh" label="尖/kWh"> </el-table-column> <el-table-column prop="peakKwh" label="尖/kWh"> </el-table-column>
<el-table-column prop="highKwh" label="峰/kWh"> </el-table-column> <el-table-column prop="highKwh" label="峰/kWh"> </el-table-column>
<el-table-column prop="flatKwh" label="平/kWh"> </el-table-column> <el-table-column prop="flatKwh" label="平/kWh"> </el-table-column>
<el-table-column prop="valleyKwh" label="谷/kWh"> </el-table-column> <el-table-column prop="valleyKwh" label="谷/kWh"> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-card <el-card
shadow="always" shadow="always"
class="sbjk-card-container" class="sbjk-card-container"
style="margin-top: 20px" style="margin-top: 20px"
:class="{ :class="{
'warning-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0', 'warning-card-container':item.ammeterMeteData.emsCommunicationStatus && item.ammeterMeteData.emsCommunicationStatus !== '0',
'running-card-container':zbInfo.emsCommunicationStatus === '0' 'running-card-container':item.ammeterMeteData.emsCommunicationStatus === '0'
}" }"
> >
<div slot="header"> <div slot="header">
<span class="large-title">2#{{ cnbInfo.deviceName }}</span> <span class="large-title">{{ item.ammeterMeteData.deviceName }}</span>
<div class="info"> <div class="info">
<div> <div>
{{ {{
$store.state.ems.communicationStatusOptions[ $store.state.ems.communicationStatusOptions[
cnbInfo.emsCommunicationStatus item.ammeterMeteData.emsCommunicationStatus
] ]
}} }}
</div> </div>
<div>数据更新时间：{{ cnbInfo.dataUpdateTime }}</div> <div>数据更新时间：{{ item.ammeterMeteData.dataUpdateTime }}</div>
</div> </div>
</div> </div>
<el-table <el-table
class="common-table" class="common-table"
:data="cnbInfo.meteDataDetailInfo" :data="item.ammeterMeteData.meteDataDetailInfo"
@cell-click="(row,col)=>{handlerCellCN(cnbInfo.deviceId,row,col)}" @cell-click="(row,col)=>{handlerCellCN(item.ammeterMeteData.deviceId,row,col)}"
stripe stripe
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="category" label="类别"> </el-table-column> <el-table-column prop="category" label="类别"> </el-table-column>
<el-table-column prop="activePower" label="有功功率"> </el-table-column> <el-table-column prop="activePower" label="有功功率"> </el-table-column>
<el-table-column prop="reactivePower" label="无功功率"> <el-table-column prop="reactivePower" label="无功功率">
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</template>
<point-chart ref="pointChart" :site-id="siteId"/> <point-chart ref="pointChart" :site-id="siteId"/>
</div> </div>
</template> </template>
@ -87,8 +89,7 @@ export default {
data() { data() {
return { return {
loading: false, loading: false,
zbInfo: {}, list:[],
cnbInfo: {},
}; };
}, },
methods: { methods: {
@ -114,12 +115,9 @@ export default {
this.loading = true; this.loading = true;
getAmmeterDataList(this.siteId) getAmmeterDataList(this.siteId)
.then((response) => { .then((response) => {
this.zbInfo = JSON.parse( // todo check
JSON.stringify(response?.data?.ammeterLoadData || {}) const data = response?.data || []
); this.list = Array.isArray(data) ? data : [data]
this.cnbInfo = JSON.parse(
JSON.stringify(response?.data?.ammeterMeteData || {})
);
}) })
.finally(() => { .finally(() => {
this.loading = false; this.loading = false;