Merge branch 'develop' into single-develop

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

@@ -78,10 +78,11 @@ import ActiveChart from "./ActiveChart.vue";
 import AlarmTable from "./AlarmTable.vue";
 import ClInfo from "./ClInfo.vue";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
+import intervalUpdate from "@/mixins/ems/intervalUpdate";
 export default {
   name: "DzjkSbjkHome",
   components: { WeekChart, ActiveChart, AlarmTable, ClInfo },
-  mixins: [getQuerySiteId],
+  mixins: [getQuerySiteId, intervalUpdate],
   data() {
     return {
       loading: false,
@@ -113,13 +114,21 @@ export default {
           attr: "dayDisChargedCap",
         },
         {
-          title: "总充电量（MWh）",
+          title: "总充电量（kWh）",
           attr: "totalChargedCap",
         },
         {
-          title: "总放电量（MWh）",
+          title: "总放电量（kWh）",
           attr: "totalDischargedCap",
         },
+        {
+          title: "总收入（元）",
+          attr: "totalRevenue",
+        },
+        {
+          title: "当日实时收入（元）",
+          attr: "dayRevenue",
+        },
       ],
       info: {}, //基本信息
       runningInfo: {}, //总累计运行数据+报警表格
@@ -156,6 +165,8 @@ export default {
       Promise.all([this.getBaseInfo(), this.getRunningInfo()]).finally(() => {
         this.loading = false;
       });
+      // 一分钟循环一次总累计运行数据
+      this.updateInterval(this.getRunningInfo);
     },
   },
 };
@@ -172,7 +183,9 @@ export default {
 .sjgl-data {
   text-align: center;
   &:nth-child(1),
-  &:nth-child(2) {
+  &:nth-child(2),
+  &:nth-child(3),
+  &:nth-child(4) {
     margin-bottom: 25px;
   }
   .sjgl-title {