优化0918

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

View File

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

View File

@ -1,30 +1,31 @@
<template>
<div v-loading="loading">
<template v-for="(item,index) in list">
<el-card
shadow="always"
class="sbjk-card-container"
:class="{
'warning-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0',
'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">
<span class="large-title">1#{{ zbInfo.deviceName }}</span>
<span class="large-title">{{ item.ammeterLoadData.deviceName }}</span>
<div class="info">
<div>
{{
$store.state.ems.communicationStatusOptions[
zbInfo.emsCommunicationStatus
item.ammeterLoadData.emsCommunicationStatus
]
}}
</div>
<div>数据更新时间{{ zbInfo.dataUpdateTime }}</div>
<div>数据更新时间{{ item.ammeterLoadData.dataUpdateTime }}</div>
</div>
</div>
<el-table
class="common-table"
:data="zbInfo.loadDataDetailInfo"
@cell-click="(row,col)=>{handlerCell(zbInfo.deviceId,row,col)}"
:data="item.ammeterLoadData.loadDataDetailInfo"
@cell-click="(row,col)=>{handlerCell(item.ammeterLoadData.deviceId,row,col)}"
stripe
style="width: 100%"
>
@ -41,27 +42,27 @@
class="sbjk-card-container"
style="margin-top: 20px"
:class="{
'warning-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0',
'running-card-container':zbInfo.emsCommunicationStatus === '0'
'warning-card-container':item.ammeterMeteData.emsCommunicationStatus && item.ammeterMeteData.emsCommunicationStatus !== '0',
'running-card-container':item.ammeterMeteData.emsCommunicationStatus === '0'
}"
>
<div slot="header">
<span class="large-title">2#{{ cnbInfo.deviceName }}</span>
<span class="large-title">{{ item.ammeterMeteData.deviceName }}</span>
<div class="info">
<div>
{{
$store.state.ems.communicationStatusOptions[
cnbInfo.emsCommunicationStatus
item.ammeterMeteData.emsCommunicationStatus
]
}}
</div>
<div>数据更新时间:{{ cnbInfo.dataUpdateTime }}</div>
<div>数据更新时间:{{ item.ammeterMeteData.dataUpdateTime }}</div>
</div>
</div>
<el-table
class="common-table"
:data="cnbInfo.meteDataDetailInfo"
@cell-click="(row,col)=>{handlerCellCN(cnbInfo.deviceId,row,col)}"
:data="item.ammeterMeteData.meteDataDetailInfo"
@cell-click="(row,col)=>{handlerCellCN(item.ammeterMeteData.deviceId,row,col)}"
stripe
style="width: 100%"
>
@ -71,6 +72,7 @@
</el-table-column>
</el-table>
</el-card>
</template>
<point-chart ref="pointChart" :site-id="siteId"/>
</div>
</template>
@ -87,8 +89,7 @@ export default {
data() {
return {
loading: false,
zbInfo: {},
cnbInfo: {},
list:[],
};
},
methods: {
@ -114,12 +115,9 @@ export default {
this.loading = true;
getAmmeterDataList(this.siteId)
.then((response) => {
this.zbInfo = JSON.parse(
JSON.stringify(response?.data?.ammeterLoadData || {})
);
this.cnbInfo = JSON.parse(
JSON.stringify(response?.data?.ammeterMeteData || {})
);
// todo check
const data = response?.data || []
this.list = Array.isArray(data) ? data : [data]
})
.finally(() => {
this.loading = false;