首页字段、收益表格

src/views/ems/dzjk/home/index.vue

@@ -57,10 +57,6 @@
           </div>
         </el-card>
       </el-col>
-      <!--策略信息-->
-      <!--      <el-col :xs="24" :sm="24" :lg="16">-->
-      <!--        <cl-info :info="runningInfo.strategyTempInfo"/>-->
-      <!--      </el-col>-->
       <!--      总累计运行数据-->
       <el-col :xs="24" :sm="24" :lg="19">
         <el-card
@@ -146,12 +142,12 @@ export default {
         },
         {
           title: "昨日充电量（kWh）",
-          attr: "todo",
+          attr: "yesterdayChargedCap",
           color: '#4472c4'
         },
         {
           title: "昨日放电量（kWh）",
-          attr: "todo",
+          attr: "yesterdayDisChargedCap",
           color: '#70ad47'
         },
         {
@@ -161,7 +157,7 @@ export default {
         },
         {
           title: "昨日实时收入（元）",
-          attr: "todo",
+          attr: "yesterdayRevenue",
           color: '#f67438'
         },
       ],
@@ -171,10 +167,6 @@ export default {
   },
   computed: {
     tableData() {
-      console.log(
-          "this.runningInfo?.siteMonitorHomeAlarmVo ",
-          this.runningInfo?.siteMonitorHomeAlarmVo
-      );
       return this.runningInfo?.siteMonitorHomeAlarmVo || [];
     },
   },

src/views/ems/dzjk/sbjk/db/index.vue

@@ -35,8 +35,7 @@
         </div>
       </div>
       <el-row class="device-info-row">
-        <template v-if="deviceIdTypeMsg[item.deviceId]">
+        <el-col v-for="(tempDataItem,tempDataIndex) in (deviceIdTypeMsg[item.deviceId] || otherTypeMsg)"
-          <el-col v-for="(tempDataItem,tempDataIndex) in deviceIdTypeMsg[item.deviceId]"
                 :key="tempDataIndex+'dbTempData'"
                 :span="8" class="device-info-col">
             <span class="pointer" @click="showChart(tempDataItem.pointName,item.deviceId)">
@@ -44,10 +43,6 @@
                 v-html="tempDataItem.unit"></span></span>
             </span>
         </el-col>
-        </template>
-        <template v-else>
-          <el-empty :image-size="80" description="未知的电表数据"></el-empty>
-        </template>
       </el-row>
     </el-card>
     <el-empty v-show="list.length<=0" :image-size="200"></el-empty>
@@ -174,7 +169,27 @@ export default {
             unit: 'kvar'
           }
         ]
-      }
+      },
+      otherTypeMsg: [
+        {
+          name: '正向有功电能',
+          attr: 'forwardActive',
+          pointName: '正向有功电能',
+          unit: 'kWh'
+        },
+        {
+          name: '反向有功电能',
+          attr: 'reverseActive',
+          pointName: '反向有功电能',
+          unit: 'kWh'
+        },
+        {
+          name: '有功功率',
+          attr: 'activePower',
+          pointName: '总有功功率',
+          unit: 'kW'
+        },
+      ]
     };
   },
   methods: {

src/views/ems/dzjk/tjbb/sybb/index.vue

@@ -27,15 +27,14 @@
         class="common-table"
         :data="tableData"
         show-summary
-        :summary-method="getSummaries"
         stripe
         style="width: 100%;margin-top:25px;">
       <!--        汇总列-->
-      <el-table-column label="汇总" min-width="180px" align="center">
+      <el-table-column label="汇总" min-width="100px" align="center">
         <el-table-column
             prop="dataTime"
             label="日期"
-            min-width="180px" align="center">
+            min-width="100px" align="center">
         </el-table-column>
       </el-table-column>
       <!--充电量列-->
@@ -94,6 +93,14 @@
             label="总">
         </el-table-column>
       </el-table-column>
+      <!--      实际收益-->
+      <el-table-column label="" align="center" fixed="right">
+        <el-table-column
+            prop="actualRevenue"
+            label="实际收益"
+            align="center">
+        </el-table-column>
+      </el-table-column>
     </el-table>
     <el-pagination
         v-show="tableData.length>0"
@@ -137,46 +144,6 @@ export default {
     }
   },
   methods: {
-    //表格汇总
-    getSummaries(param) {
-      const {columns, data} = param;
-      const sums = [];
-
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          const activeTotal = data.map(item => item.activeTotalPrice).reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-          const reActiveTotal = data.map(item => item.reActiveTotalPrice).reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-          sums[index] = '价差收入 : ' + (reActiveTotal - activeTotal);
-          return
-        }
-        const values = data.map(item => Number(item[column.property]));
-        if (!values.every(value => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-        }
-      })
-      return sums
-    },
     // 搜索
     onSearch() {
       this.pageNum = 1//每次搜索从1开始搜索