From 1f49a3af20d0d4a4fe2bcd26f8a2c7b35c13061e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Thu, 25 Sep 2025 17:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=960918?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/dzjk/home/index.vue    |   9 ++
 src/views/ems/dzjk/sbjk/db/index.vue | 152 +++++++++++++--------------
 2 files changed, 84 insertions(+), 77 deletions(-)

diff --git a/src/views/ems/dzjk/home/index.vue b/src/views/ems/dzjk/home/index.vue
index f01824c..403ffbe 100644
--- a/src/views/ems/dzjk/home/index.vue
+++ b/src/views/ems/dzjk/home/index.vue
@@ -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: {}, //总累计运行数据+报警表格
diff --git a/src/views/ems/dzjk/sbjk/db/index.vue b/src/views/ems/dzjk/sbjk/db/index.vue
index 52f6450..ce893a7 100644
--- a/src/views/ems/dzjk/sbjk/db/index.vue
+++ b/src/views/ems/dzjk/sbjk/db/index.vue
@@ -1,76 +1,78 @@
 <template>
   <div v-loading="loading">
-    <el-card
-      shadow="always"
-      class="sbjk-card-container"
-      :class="{
-        'warning-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0',
-        'running-card-container':zbInfo.emsCommunicationStatus === '0'
+   <template v-for="(item,index) in list">
+     <el-card
+         shadow="always"
+         class="sbjk-card-container"
+         :class="{
+        '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>
-        <div class="info">
-          <div>
-            {{
-              $store.state.ems.communicationStatusOptions[
-                zbInfo.emsCommunicationStatus
-              ]
-            }}
-          </div>
-          <div>数据更新时间：{{ zbInfo.dataUpdateTime }}</div>
-        </div>
-      </div>
-      <el-table
-        class="common-table"
-        :data="zbInfo.loadDataDetailInfo"
-        @cell-click="(row,col)=>{handlerCell(zbInfo.deviceId,row,col)}"
-        stripe
-        style="width: 100%"
-      >
-        <el-table-column prop="category" label="类别"> </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="highKwh" 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>
-    </el-card>
-    <el-card
-      shadow="always"
-      class="sbjk-card-container"
-      style="margin-top: 20px"
-      :class="{
-        'warning-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0',
-        'running-card-container':zbInfo.emsCommunicationStatus === '0'
+     >
+       <div slot="header">
+         <span class="large-title">{{ item.ammeterLoadData.deviceName }}</span>
+         <div class="info">
+           <div>
+             {{
+               $store.state.ems.communicationStatusOptions[
+                   item.ammeterLoadData.emsCommunicationStatus
+                   ]
+             }}
+           </div>
+           <div>数据更新时间：{{ item.ammeterLoadData.dataUpdateTime }}</div>
+         </div>
+       </div>
+       <el-table
+           class="common-table"
+           :data="item.ammeterLoadData.loadDataDetailInfo"
+           @cell-click="(row,col)=>{handlerCell(item.ammeterLoadData.deviceId,row,col)}"
+           stripe
+           style="width: 100%"
+       >
+         <el-table-column prop="category" label="类别"> </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="highKwh" 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>
+     </el-card>
+     <el-card
+         shadow="always"
+         class="sbjk-card-container"
+         style="margin-top: 20px"
+         :class="{
+        '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>
-        <div class="info">
-          <div>
-            {{
-              $store.state.ems.communicationStatusOptions[
-                cnbInfo.emsCommunicationStatus
-              ]
-            }}
-          </div>
-          <div>数据更新时间：{{ cnbInfo.dataUpdateTime }}</div>
-        </div>
-      </div>
-      <el-table
-        class="common-table"
-        :data="cnbInfo.meteDataDetailInfo"
-        @cell-click="(row,col)=>{handlerCellCN(cnbInfo.deviceId,row,col)}"
-        stripe
-        style="width: 100%"
-      >
-        <el-table-column prop="category" label="类别"> </el-table-column>
-        <el-table-column prop="activePower" label="有功功率"> </el-table-column>
-        <el-table-column prop="reactivePower" label="无功功率">
-        </el-table-column>
-      </el-table>
-    </el-card>
+     >
+       <div slot="header">
+         <span class="large-title">{{ item.ammeterMeteData.deviceName }}</span>
+         <div class="info">
+           <div>
+             {{
+               $store.state.ems.communicationStatusOptions[
+                   item.ammeterMeteData.emsCommunicationStatus
+                   ]
+             }}
+           </div>
+           <div>数据更新时间：{{ item.ammeterMeteData.dataUpdateTime }}</div>
+         </div>
+       </div>
+       <el-table
+           class="common-table"
+           :data="item.ammeterMeteData.meteDataDetailInfo"
+           @cell-click="(row,col)=>{handlerCellCN(item.ammeterMeteData.deviceId,row,col)}"
+           stripe
+           style="width: 100%"
+       >
+         <el-table-column prop="category" label="类别"> </el-table-column>
+         <el-table-column prop="activePower" label="有功功率"> </el-table-column>
+         <el-table-column prop="reactivePower" label="无功功率">
+         </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;