王子文 电厂大屏

master/src/main/java/com/ruoyi/project/aspen/controller/TElecdashboardDayController.java

@@ -33,6 +33,18 @@ public class TElecdashboardDayController extends BaseController
     @Autowired
     private ITElecdashboardDayService tElecdashboardDayService;
 
+    /**
+     * 查询日期最靠前的7条电厂大屏每日数据
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:day:list')")
+    @GetMapping("/listLatest7")
+    public TableDataInfo listLatest7()
+    {
+        startPage();
+        List<TElecdashboardDay> list = tElecdashboardDayService.selectTElecdashboardDayListLatest7();
+        return getDataTable(list);
+    }
+
     /**
      * 查询电厂大屏每日数据列表
      */

master/src/main/java/com/ruoyi/project/aspen/mapper/TElecdashboardDayMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.project.aspen.mapper;
 import java.util.List;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.project.aspen.domain.TElecdashboardDay;
+import com.ruoyi.project.aspen.domain.TElecdashboardRealtime;
 
 /**
  * 电厂大屏每日数据Mapper接口
@@ -12,6 +13,13 @@ import com.ruoyi.project.aspen.domain.TElecdashboardDay;
  */
 public interface TElecdashboardDayMapper 
 {
+    /**
+     * 查询日期最靠前的7条电厂大屏每日数据
+     *
+     * @return 日期最靠前的7条电厂大屏每日数据
+     */
+    public List<TElecdashboardDay> selectTElecdashboardDayListLatest7();
+
     /**
      * 查询电厂大屏每日数据
      * 

master/src/main/java/com/ruoyi/project/aspen/service/ITElecdashboardDayService.java

@@ -11,6 +11,13 @@ import com.ruoyi.project.aspen.domain.TElecdashboardDay;
  */
 public interface ITElecdashboardDayService 
 {
+    /**
+     * 查询日期最靠前的7条电厂大屏每日数据
+     *
+     * @return 日期最靠前的7条电厂大屏每日数据
+     */
+    public List<TElecdashboardDay> selectTElecdashboardDayListLatest7();
+
     /**
      * 查询电厂大屏每日数据
      * 

master/src/main/java/com/ruoyi/project/aspen/service/impl/TElecdashboardDayServiceImpl.java

@@ -19,6 +19,16 @@ public class TElecdashboardDayServiceImpl implements ITElecdashboardDayService
     @Autowired
     private TElecdashboardDayMapper tElecdashboardDayMapper;
 
+    /**
+     * 查询日期最靠前的7条电厂大屏每日数据
+     *
+     * @return 日期最靠前的7条电厂大屏每日数据
+     */
+    @Override
+    public List<TElecdashboardDay> selectTElecdashboardDayListLatest7() {
+        return tElecdashboardDayMapper.selectTElecdashboardDayListLatest7();
+    }
+
     /**
      * 查询电厂大屏每日数据
      *

ui/src/api/aspen/day.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// 查询日期最靠前的7条电厂大屏每日数据
+export function listDayLatest7() {
+  return request({
+    url: '/aspen/day/listLatest7',
+    method: 'get'
+  })
+}
+
 // 查询电厂大屏每日数据列表
 export function listDay(query) {
   return request({
@@ -50,4 +58,4 @@ export function exportDay(query) {
     method: 'get',
     params: query
   })
-}
+}

ui/src/views/monitor/elec/analysisBottomLeft3.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <analysisChartBottomLeft3></analysisChartBottomLeft3>
+    <analysisChartBottomLeft3 v-bind="$attrs"></analysisChartBottomLeft3>
   </div>
 </template>
 
@@ -20,4 +20,4 @@ export default {
 
 <style>
 
-</style>
+</style>

ui/src/views/monitor/elec/analysisBottomLeft4.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <analysisChartBottomLeft4></analysisChartBottomLeft4>
+    <analysisChartBottomLeft4 v-bind="$attrs"></analysisChartBottomLeft4>
   </div>
 </template>
 
@@ -20,4 +20,4 @@ export default {
 
 <style>
 
-</style>
+</style>

ui/src/views/monitor/elec/analysisTopCenter.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <analysisChartTopCenter></analysisChartTopCenter>
+    <analysisChartTopCenter v-bind="$attrs"></analysisChartTopCenter>
   </div>
 </template>
 
@@ -20,4 +20,4 @@ export default {
 
 <style>
 
-</style>
+</style>

ui/src/views/monitor/elec/analysisTopLeft.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <analysisChartTopLeft></analysisChartTopLeft>
+    <analysisChartTopLeft v-bind="$attrs"></analysisChartTopLeft>
   </div>
 </template>
 
@@ -20,4 +20,4 @@ export default {
 
 <style>
 
-</style>
+</style>

ui/src/views/monitor/elec/analysisTopRight.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <analysisChartTopRight></analysisChartTopRight>
+    <analysisChartTopRight v-bind="$attrs"></analysisChartTopRight>
   </div>
 </template>
 
@@ -20,4 +20,4 @@ export default {
 
 <style>
 
-</style>
+</style>

ui/src/views/monitor/elec/echart/analysisChart/analysisChartBottomLeft1.vue

@@ -10,14 +10,28 @@ export default {
     props: ['dashboarddata'],
     data() {
         return {
-            chart: null
+            chart: null,
+            wasteAvg: null,
+            rainAvg: null
         }
     },
     mixins: [echartMixins],
     mounted() {
+        this.calcAvg();
         this.init();
     },
     methods: {
+        calcAvg() {
+            let latest7DayData = this.dashboarddata.latest7DayData;
+            let wasteTotal = 0;
+            let rainTotal = 0;
+            for (let i = 0; i < latest7DayData.length; i++) {
+              wasteTotal += Number(latest7DayData[i].wastePh);
+              rainTotal += Number(latest7DayData[i].rainPh);
+            }
+            this.wasteAvg = (wasteTotal / 7).toFixed(1);
+            this.rainAvg = (rainTotal / 7).toFixed(1);
+        },
         init() {
             this.chart = this.echarts.init(document.getElementById("analysisChartBottomLeft1"), 'dark');
             let option = {
@@ -84,7 +98,7 @@ export default {
                     {
                         name: '7 天平均 PH',
                         type: 'bar',
-                        data: [11, 7],
+                        data: [this.wasteAvg, this.rainAvg],
                         color: '#A8CBFF',
                         itemStyle: {
                             normal: {

ui/src/views/monitor/elec/echart/analysisChart/analysisChartBottomLeft2.vue

@@ -11,13 +11,27 @@ export default {
     data() {
         return {
             chart: null,
+            wasteAvg: null,
+            rainAvg: null
         }
     },
     mixins: [echartMixins],
     mounted() {
+        this.calcAvg();
         this.init();
     },
     methods: {
+        calcAvg() {
+          let latest7DayData = this.dashboarddata.latest7DayData;
+          let wasteTotal = 0;
+          let rainTotal = 0;
+          for (let i = 0; i < latest7DayData.length; i++) {
+            wasteTotal += Number(latest7DayData[i].wasteCod);
+            rainTotal += Number(latest7DayData[i].rainCod);
+          }
+          this.wasteAvg = (wasteTotal / 7).toFixed(1);
+          this.rainAvg = (rainTotal / 7).toFixed(1);
+        },
         init() {
             this.chart = this.echarts.init(document.getElementById("analysisChartBottomLeft2"), 'dark');
             let option = {
@@ -85,7 +99,7 @@ export default {
                     {
                         name: '7 天平均 COD',
                         type: 'bar',
-                        data: [170, 110],
+                        data: [this.wasteAvg, this.rainAvg],
                         color: '#D2FFE4',
                         itemStyle: {
                             normal: {

ui/src/views/monitor/elec/echart/analysisChart/analysisChartBottomLeft3.vue

@@ -10,6 +10,7 @@
 <script>
 import echartMixins from "@/utils/resizeMixins";
 export default {
+    props: ['dashboarddata'],
     data() {
         return {
             chart: null,
@@ -59,7 +60,15 @@ export default {
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                    data: [
+                      this.dashboarddata.latest7DayData[0].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[1].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[2].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[3].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[4].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[5].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[6].pullDate.toString().substr(5, 5)
+                    ],
                     axisLabel: {
                         color: '#808080'
                     },
@@ -81,7 +90,15 @@ export default {
                         name: 'Waste Water',
                         type: 'line',
                         smooth: true,
-                        data: [120, 132, 101, 134, 150, 230, 210],
+                        data: [
+                          this.dashboarddata.latest7DayData[0].wastePh,
+                          this.dashboarddata.latest7DayData[1].wastePh,
+                          this.dashboarddata.latest7DayData[2].wastePh,
+                          this.dashboarddata.latest7DayData[3].wastePh,
+                          this.dashboarddata.latest7DayData[4].wastePh,
+                          this.dashboarddata.latest7DayData[5].wastePh,
+                          this.dashboarddata.latest7DayData[6].wastePh
+                        ],
                         symbolSize: 10,
                         color: '#5470c6',
                         lineStyle: {
@@ -96,7 +113,15 @@ export default {
                         name: 'Rain Water',
                         type: 'line',
                         smooth: true,
-                        data: [220, 250, 291, 234, 290, 330, 310],
+                        data: [
+                          this.dashboarddata.latest7DayData[0].rainPh,
+                          this.dashboarddata.latest7DayData[1].rainPh,
+                          this.dashboarddata.latest7DayData[2].rainPh,
+                          this.dashboarddata.latest7DayData[3].rainPh,
+                          this.dashboarddata.latest7DayData[4].rainPh,
+                          this.dashboarddata.latest7DayData[5].rainPh,
+                          this.dashboarddata.latest7DayData[6].rainPh
+                        ],
                         symbolSize: 10,
                         color: '#73c0de',
                         lineStyle: {
@@ -135,7 +160,15 @@ export default {
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                    data: [
+                      this.dashboarddata.latest7DayData[0].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[1].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[2].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[3].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[4].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[5].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[6].pullDate.toString().substr(5, 5)
+                    ],
                     axisLabel: {
                         color: '#808080'
                     },
@@ -151,7 +184,15 @@ export default {
                         name: 'Waste Water',
                         type: 'line',
                         smooth: true,
-                        data: [120, 132, 101, 134, 150, 230, 210],
+                        data: [
+                          this.dashboarddata.latest7DayData[0].wastePh,
+                          this.dashboarddata.latest7DayData[1].wastePh,
+                          this.dashboarddata.latest7DayData[2].wastePh,
+                          this.dashboarddata.latest7DayData[3].wastePh,
+                          this.dashboarddata.latest7DayData[4].wastePh,
+                          this.dashboarddata.latest7DayData[5].wastePh,
+                          this.dashboarddata.latest7DayData[6].wastePh
+                        ],
                         symbolSize: 10,
                         color: '#5470c6',
                         lineStyle: {
@@ -166,7 +207,15 @@ export default {
                         name: 'Rain Water',
                         type: 'line',
                         smooth: true,
-                        data: [220, 250, 291, 234, 290, 330, 310],
+                        data: [
+                          this.dashboarddata.latest7DayData[0].rainPh,
+                          this.dashboarddata.latest7DayData[1].rainPh,
+                          this.dashboarddata.latest7DayData[2].rainPh,
+                          this.dashboarddata.latest7DayData[3].rainPh,
+                          this.dashboarddata.latest7DayData[4].rainPh,
+                          this.dashboarddata.latest7DayData[5].rainPh,
+                          this.dashboarddata.latest7DayData[6].rainPh
+                        ],
                         symbolSize: 10,
                         color: '#73c0de',
                         lineStyle: {
@@ -190,4 +239,4 @@ export default {
 
 <style>
 
-</style>
+</style>

ui/src/views/monitor/elec/echart/analysisChart/analysisChartBottomLeft4.vue

@@ -10,6 +10,7 @@
 <script>
 import echartMixins from "@/utils/resizeMixins";
 export default {
+    props: ['dashboarddata'],
     data() {
         return {
             chart: null,
@@ -59,7 +60,15 @@ export default {
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                    data: [
+                      this.dashboarddata.latest7DayData[0].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[1].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[2].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[3].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[4].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[5].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[6].pullDate.toString().substr(5, 5)
+                    ],
                     axisLabel: {
                         color: '#808080'
                     },
@@ -82,7 +91,15 @@ export default {
                         name: 'Waste Water',
                         type: 'line',
                         smooth: true,
-                        data: [120, 132, 101, 134, 150, 230, 210],
+                        data: [
+                          this.dashboarddata.latest7DayData[0].wasteCod,
+                          this.dashboarddata.latest7DayData[1].wasteCod,
+                          this.dashboarddata.latest7DayData[2].wasteCod,
+                          this.dashboarddata.latest7DayData[3].wasteCod,
+                          this.dashboarddata.latest7DayData[4].wasteCod,
+                          this.dashboarddata.latest7DayData[5].wasteCod,
+                          this.dashboarddata.latest7DayData[6].wasteCod
+                        ],
                         symbolSize: 10,
                         color: '#5470c6',
                         lineStyle: {
@@ -97,7 +114,15 @@ export default {
                         name: 'Rain Water',
                         type: 'line',
                         smooth: true,
-                        data: [220, 250, 291, 234, 290, 330, 310],
+                        data: [
+                          this.dashboarddata.latest7DayData[0].rainCod,
+                          this.dashboarddata.latest7DayData[1].rainCod,
+                          this.dashboarddata.latest7DayData[2].rainCod,
+                          this.dashboarddata.latest7DayData[3].rainCod,
+                          this.dashboarddata.latest7DayData[4].rainCod,
+                          this.dashboarddata.latest7DayData[5].rainCod,
+                          this.dashboarddata.latest7DayData[6].rainCod
+                        ],
                         symbolSize: 10,
                         color: '#73c0de',
                         lineStyle: {
@@ -136,7 +161,15 @@ export default {
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                    data: [
+                      this.dashboarddata.latest7DayData[0].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[1].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[2].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[3].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[4].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[5].pullDate.toString().substr(5, 5),
+                      this.dashboarddata.latest7DayData[6].pullDate.toString().substr(5, 5)
+                    ],
                     axisLabel: {
                         color: '#808080'
                     },
@@ -153,7 +186,15 @@ export default {
                         name: 'Waste Water',
                         type: 'line',
                         smooth: true,
-                        data: [120, 132, 101, 134, 150, 230, 210],
+                        data: [
+                          this.dashboarddata.latest7DayData[0].wasteCod,
+                          this.dashboarddata.latest7DayData[1].wasteCod,
+                          this.dashboarddata.latest7DayData[2].wasteCod,
+                          this.dashboarddata.latest7DayData[3].wasteCod,
+                          this.dashboarddata.latest7DayData[4].wasteCod,
+                          this.dashboarddata.latest7DayData[5].wasteCod,
+                          this.dashboarddata.latest7DayData[6].wasteCod
+                        ],
                         symbolSize: 10,
                         color: '#5470c6',
                         lineStyle: {
@@ -168,7 +209,15 @@ export default {
                         name: 'Rain Water',
                         type: 'line',
                         smooth: true,
-                        data: [220, 250, 291, 234, 290, 330, 310],
+                        data: [
+                          this.dashboarddata.latest7DayData[0].rainCod,
+                          this.dashboarddata.latest7DayData[1].rainCod,
+                          this.dashboarddata.latest7DayData[2].rainCod,
+                          this.dashboarddata.latest7DayData[3].rainCod,
+                          this.dashboarddata.latest7DayData[4].rainCod,
+                          this.dashboarddata.latest7DayData[5].rainCod,
+                          this.dashboarddata.latest7DayData[6].rainCod
+                        ],
                         symbolSize: 10,
                         color: '#73c0de',
                         lineStyle: {
@@ -192,4 +241,4 @@ export default {
 
 <style>
 
-</style>
+</style>

ui/src/views/monitor/elec/echart/analysisChart/analysisChartTopCenter.vue

@@ -10,6 +10,7 @@
 <script>
 import echartMixins from "@/utils/resizeMixins";
 export default {
+    props: ['latest7DayData'],
     data() {
         return {
             chart: null,
@@ -59,7 +60,15 @@ export default {
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                    data: [
+                      this.latest7DayData[0].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[1].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[2].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[3].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[4].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[5].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[6].pullDate.toString().substr(5, 5)
+                    ],
                     axisLabel: {
                         color: '#808080'
                     },
@@ -82,7 +91,15 @@ export default {
                         name: '烟尘',
                         type: 'line',
                         smooth: true,
-                        data: [80,90,70,20,10,60,50],
+                        data: [
+                          this.latest7DayData[0].hrsg2SmokeConvert,
+                          this.latest7DayData[1].hrsg2SmokeConvert,
+                          this.latest7DayData[2].hrsg2SmokeConvert,
+                          this.latest7DayData[3].hrsg2SmokeConvert,
+                          this.latest7DayData[4].hrsg2SmokeConvert,
+                          this.latest7DayData[5].hrsg2SmokeConvert,
+                          this.latest7DayData[6].hrsg2SmokeConvert
+                        ],
                         symbolSize: 10,
                         color: '#FF9800',
                         lineStyle: {
@@ -97,7 +114,15 @@ export default {
                         name: 'SO2',
                         type: 'line',
                         smooth: true,
-                        data: [1400,2200,1300,1800,2500,1100,1300],
+                        data: [
+                          this.latest7DayData[0].hrsg2So2Convert,
+                          this.latest7DayData[1].hrsg2So2Convert,
+                          this.latest7DayData[2].hrsg2So2Convert,
+                          this.latest7DayData[3].hrsg2So2Convert,
+                          this.latest7DayData[4].hrsg2So2Convert,
+                          this.latest7DayData[5].hrsg2So2Convert,
+                          this.latest7DayData[6].hrsg2So2Convert
+                        ],
                         symbolSize: 10,
                         color: '#9D00FF',
                         lineStyle: {
@@ -112,7 +137,15 @@ export default {
                         name: 'NOx',
                         type: 'line',
                         smooth: true,
-                        data: [400,200,300,800,500,100,300],
+                        data: [
+                          this.latest7DayData[0].hrsg2NoxConvert,
+                          this.latest7DayData[1].hrsg2NoxConvert,
+                          this.latest7DayData[2].hrsg2NoxConvert,
+                          this.latest7DayData[3].hrsg2NoxConvert,
+                          this.latest7DayData[4].hrsg2NoxConvert,
+                          this.latest7DayData[5].hrsg2NoxConvert,
+                          this.latest7DayData[6].hrsg2NoxConvert
+                        ],
                         symbolSize: 10,
                         color: '#00FF0D',
                         lineStyle: {
@@ -151,7 +184,15 @@ export default {
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                    data: [
+                      this.latest7DayData[0].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[1].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[2].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[3].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[4].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[5].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[6].pullDate.toString().substr(5, 5)
+                    ],
                     axisLabel: {
                         color: '#808080'
                     },
@@ -168,7 +209,15 @@ export default {
                         name: '烟尘',
                         type: 'line',
                         smooth: true,
-                        data: [80,90,70,20,10,60,50],
+                        data: [
+                          this.latest7DayData[0].hrsg2SmokeConvert,
+                          this.latest7DayData[1].hrsg2SmokeConvert,
+                          this.latest7DayData[2].hrsg2SmokeConvert,
+                          this.latest7DayData[3].hrsg2SmokeConvert,
+                          this.latest7DayData[4].hrsg2SmokeConvert,
+                          this.latest7DayData[5].hrsg2SmokeConvert,
+                          this.latest7DayData[6].hrsg2SmokeConvert
+                        ],
                         symbolSize: 10,
                         color: '#FF9800',
                         lineStyle: {
@@ -183,7 +232,15 @@ export default {
                         name: 'SO2',
                         type: 'line',
                         smooth: true,
-                        data: [1400,2200,1300,1800,2500,1100,1300],
+                        data: [
+                          this.latest7DayData[0].hrsg2So2Convert,
+                          this.latest7DayData[1].hrsg2So2Convert,
+                          this.latest7DayData[2].hrsg2So2Convert,
+                          this.latest7DayData[3].hrsg2So2Convert,
+                          this.latest7DayData[4].hrsg2So2Convert,
+                          this.latest7DayData[5].hrsg2So2Convert,
+                          this.latest7DayData[6].hrsg2So2Convert
+                        ],
                         symbolSize: 10,
                         color: '#9D00FF',
                         lineStyle: {
@@ -198,7 +255,15 @@ export default {
                         name: 'NOx',
                         type: 'line',
                         smooth: true,
-                        data: [400,200,300,800,500,100,300],
+                        data: [
+                          this.latest7DayData[0].hrsg2NoxConvert,
+                          this.latest7DayData[1].hrsg2NoxConvert,
+                          this.latest7DayData[2].hrsg2NoxConvert,
+                          this.latest7DayData[3].hrsg2NoxConvert,
+                          this.latest7DayData[4].hrsg2NoxConvert,
+                          this.latest7DayData[5].hrsg2NoxConvert,
+                          this.latest7DayData[6].hrsg2NoxConvert
+                        ],
                         symbolSize: 10,
                         color: '#00FF0D',
                         lineStyle: {
@@ -222,4 +287,4 @@ export default {
 
 <style>
 
-</style>
+</style>

ui/src/views/monitor/elec/echart/analysisChart/analysisChartTopLeft.vue

@@ -10,6 +10,7 @@
 <script>
 import echartMixins from "@/utils/resizeMixins";
 export default {
+    props: ['latest7DayData'],
     data() {
         return {
             chart: null,
@@ -59,7 +60,15 @@ export default {
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                    data: [
+                      this.latest7DayData[0].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[1].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[2].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[3].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[4].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[5].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[6].pullDate.toString().substr(5, 5)
+                    ],
                     axisLabel: {
                         color: '#808080'
                     },
@@ -82,7 +91,15 @@ export default {
                         name: '烟尘',
                         type: 'line',
                         smooth: true,
-                        data: [80,90,70,20,10,60,50],
+                        data: [
+                          this.latest7DayData[0].hrsg1SmokeConvert,
+                          this.latest7DayData[1].hrsg1SmokeConvert,
+                          this.latest7DayData[2].hrsg1SmokeConvert,
+                          this.latest7DayData[3].hrsg1SmokeConvert,
+                          this.latest7DayData[4].hrsg1SmokeConvert,
+                          this.latest7DayData[5].hrsg1SmokeConvert,
+                          this.latest7DayData[6].hrsg1SmokeConvert
+                        ],
                         symbolSize: 10,
                         color: '#FF9800',
                         lineStyle: {
@@ -97,7 +114,15 @@ export default {
                         name: 'SO2',
                         type: 'line',
                         smooth: true,
-                        data: [1400,2200,1300,1800,2500,1100,1300],
+                        data: [
+                          this.latest7DayData[0].hrsg1So2Convert,
+                          this.latest7DayData[1].hrsg1So2Convert,
+                          this.latest7DayData[2].hrsg1So2Convert,
+                          this.latest7DayData[3].hrsg1So2Convert,
+                          this.latest7DayData[4].hrsg1So2Convert,
+                          this.latest7DayData[5].hrsg1So2Convert,
+                          this.latest7DayData[6].hrsg1So2Convert
+                        ],
                         symbolSize: 10,
                         color: '#9D00FF',
                         lineStyle: {
@@ -112,7 +137,15 @@ export default {
                         name: 'NOx',
                         type: 'line',
                         smooth: true,
-                        data: [400,200,300,800,500,100,300],
+                        data: [
+                          this.latest7DayData[0].hrsg1NoxConvert,
+                          this.latest7DayData[1].hrsg1NoxConvert,
+                          this.latest7DayData[2].hrsg1NoxConvert,
+                          this.latest7DayData[3].hrsg1NoxConvert,
+                          this.latest7DayData[4].hrsg1NoxConvert,
+                          this.latest7DayData[5].hrsg1NoxConvert,
+                          this.latest7DayData[6].hrsg1NoxConvert
+                        ],
                         symbolSize: 10,
                         color: '#00FF0D',
                         lineStyle: {
@@ -151,7 +184,15 @@ export default {
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                    data: [
+                      this.latest7DayData[0].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[1].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[2].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[3].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[4].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[5].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[6].pullDate.toString().substr(5, 5)
+                    ],
                     axisLabel: {
                         color: '#808080'
                     },
@@ -168,7 +209,15 @@ export default {
                         name: '烟尘',
                         type: 'line',
                         smooth: true,
-                        data: [80,90,70,20,10,60,50],
+                        data: [
+                          this.latest7DayData[0].hrsg1SmokeConvert,
+                          this.latest7DayData[1].hrsg1SmokeConvert,
+                          this.latest7DayData[2].hrsg1SmokeConvert,
+                          this.latest7DayData[3].hrsg1SmokeConvert,
+                          this.latest7DayData[4].hrsg1SmokeConvert,
+                          this.latest7DayData[5].hrsg1SmokeConvert,
+                          this.latest7DayData[6].hrsg1SmokeConvert
+                        ],
                         symbolSize: 10,
                         color: '#FF9800',
                         lineStyle: {
@@ -183,7 +232,15 @@ export default {
                         name: 'SO2',
                         type: 'line',
                         smooth: true,
-                        data: [1400,2200,1300,1800,2500,1100,1300],
+                        data: [
+                          this.latest7DayData[0].hrsg1So2Convert,
+                          this.latest7DayData[1].hrsg1So2Convert,
+                          this.latest7DayData[2].hrsg1So2Convert,
+                          this.latest7DayData[3].hrsg1So2Convert,
+                          this.latest7DayData[4].hrsg1So2Convert,
+                          this.latest7DayData[5].hrsg1So2Convert,
+                          this.latest7DayData[6].hrsg1So2Convert
+                        ],
                         symbolSize: 10,
                         color: '#9D00FF',
                         lineStyle: {
@@ -198,7 +255,15 @@ export default {
                         name: 'NOx',
                         type: 'line',
                         smooth: true,
-                        data: [400,200,300,800,500,100,300],
+                        data: [
+                          this.latest7DayData[0].hrsg1NoxConvert,
+                          this.latest7DayData[1].hrsg1NoxConvert,
+                          this.latest7DayData[2].hrsg1NoxConvert,
+                          this.latest7DayData[3].hrsg1NoxConvert,
+                          this.latest7DayData[4].hrsg1NoxConvert,
+                          this.latest7DayData[5].hrsg1NoxConvert,
+                          this.latest7DayData[6].hrsg1NoxConvert
+                        ],
                         symbolSize: 10,
                         color: '#00FF0D',
                         lineStyle: {
@@ -222,4 +287,4 @@ export default {
 
 <style>
 
-</style>
+</style>

ui/src/views/monitor/elec/echart/analysisChart/analysisChartTopRight.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div id="analysisChartTopRight" @click="dialogVisible = true" style="width:6.8rem;height:2.5rem;"></div>
-        <el-dialog title="HRSG 2#" :visible.sync="dialogVisible" width="1600px" @open="open" destroy-on-close append-to-body>
+        <el-dialog title="HRSG 3#" :visible.sync="dialogVisible" width="1600px" @open="open" destroy-on-close append-to-body>
             <div id="analysisChartTopRight2" style="width:20rem;height:6rem;margin:0.5rem auto;"></div>
         </el-dialog>
     </div>
@@ -10,6 +10,7 @@
 <script>
 import echartMixins from "@/utils/resizeMixins";
 export default {
+    props: ['latest7DayData'],
     data() {
         return {
             chart: null,
@@ -59,7 +60,15 @@ export default {
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                    data: [
+                      this.latest7DayData[0].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[1].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[2].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[3].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[4].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[5].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[6].pullDate.toString().substr(5, 5)
+                    ],
                     axisLabel: {
                         color: '#808080'
                     },
@@ -82,7 +91,15 @@ export default {
                         name: '烟尘',
                         type: 'line',
                         smooth: true,
-                        data: [80,90,70,20,10,60,50],
+                        data: [
+                          this.latest7DayData[0].hrsg3SmokeConvert,
+                          this.latest7DayData[1].hrsg3SmokeConvert,
+                          this.latest7DayData[2].hrsg3SmokeConvert,
+                          this.latest7DayData[3].hrsg3SmokeConvert,
+                          this.latest7DayData[4].hrsg3SmokeConvert,
+                          this.latest7DayData[5].hrsg3SmokeConvert,
+                          this.latest7DayData[6].hrsg3SmokeConvert
+                        ],
                         symbolSize: 10,
                         color: '#FF9800',
                         lineStyle: {
@@ -97,7 +114,15 @@ export default {
                         name: 'SO2',
                         type: 'line',
                         smooth: true,
-                        data: [1400,2200,1300,1800,2500,1100,1300],
+                        data: [
+                          this.latest7DayData[0].hrsg3So2Convert,
+                          this.latest7DayData[1].hrsg3So2Convert,
+                          this.latest7DayData[2].hrsg3So2Convert,
+                          this.latest7DayData[3].hrsg3So2Convert,
+                          this.latest7DayData[4].hrsg3So2Convert,
+                          this.latest7DayData[5].hrsg3So2Convert,
+                          this.latest7DayData[6].hrsg3So2Convert
+                        ],
                         symbolSize: 10,
                         color: '#9D00FF',
                         lineStyle: {
@@ -112,7 +137,15 @@ export default {
                         name: 'NOx',
                         type: 'line',
                         smooth: true,
-                        data: [400,200,300,800,500,100,300],
+                        data: [
+                          this.latest7DayData[0].hrsg3NoxConvert,
+                          this.latest7DayData[1].hrsg3NoxConvert,
+                          this.latest7DayData[2].hrsg3NoxConvert,
+                          this.latest7DayData[3].hrsg3NoxConvert,
+                          this.latest7DayData[4].hrsg3NoxConvert,
+                          this.latest7DayData[5].hrsg3NoxConvert,
+                          this.latest7DayData[6].hrsg3NoxConvert
+                        ],
                         symbolSize: 10,
                         color: '#00FF0D',
                         lineStyle: {
@@ -151,7 +184,15 @@ export default {
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                    data: [
+                      this.latest7DayData[0].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[1].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[2].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[3].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[4].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[5].pullDate.toString().substr(5, 5),
+                      this.latest7DayData[6].pullDate.toString().substr(5, 5)
+                    ],
                     axisLabel: {
                         color: '#808080'
                     },
@@ -168,7 +209,15 @@ export default {
                         name: '烟尘',
                         type: 'line',
                         smooth: true,
-                        data: [80,90,70,20,10,60,50],
+                        data: [
+                          this.latest7DayData[0].hrsg3SmokeConvert,
+                          this.latest7DayData[1].hrsg3SmokeConvert,
+                          this.latest7DayData[2].hrsg3SmokeConvert,
+                          this.latest7DayData[3].hrsg3SmokeConvert,
+                          this.latest7DayData[4].hrsg3SmokeConvert,
+                          this.latest7DayData[5].hrsg3SmokeConvert,
+                          this.latest7DayData[6].hrsg3SmokeConvert
+                        ],
                         symbolSize: 10,
                         color: '#FF9800',
                         lineStyle: {
@@ -183,7 +232,15 @@ export default {
                         name: 'SO2',
                         type: 'line',
                         smooth: true,
-                        data: [1400,2200,1300,1800,2500,1100,1300],
+                        data: [
+                          this.latest7DayData[0].hrsg3So2Convert,
+                          this.latest7DayData[1].hrsg3So2Convert,
+                          this.latest7DayData[2].hrsg3So2Convert,
+                          this.latest7DayData[3].hrsg3So2Convert,
+                          this.latest7DayData[4].hrsg3So2Convert,
+                          this.latest7DayData[5].hrsg3So2Convert,
+                          this.latest7DayData[6].hrsg3So2Convert
+                        ],
                         symbolSize: 10,
                         color: '#9D00FF',
                         lineStyle: {
@@ -198,7 +255,15 @@ export default {
                         name: 'NOx',
                         type: 'line',
                         smooth: true,
-                        data: [400,200,300,800,500,100,300],
+                        data: [
+                          this.latest7DayData[0].hrsg3NoxConvert,
+                          this.latest7DayData[1].hrsg3NoxConvert,
+                          this.latest7DayData[2].hrsg3NoxConvert,
+                          this.latest7DayData[3].hrsg3NoxConvert,
+                          this.latest7DayData[4].hrsg3NoxConvert,
+                          this.latest7DayData[5].hrsg3NoxConvert,
+                          this.latest7DayData[6].hrsg3NoxConvert
+                        ],
                         symbolSize: 10,
                         color: '#00FF0D',
                         lineStyle: {
@@ -222,4 +287,4 @@ export default {
 
 <style>
 
-</style>
+</style>

ui/src/views/monitor/elec/elecindex.vue

@@ -135,7 +135,12 @@
       </div>
       <div class="body-box" v-if="dashboard === 3">
         <div>
-          <front-elec-three :dashboardelecdata="dashboardelecdata" :dashboarddata="dashboarddata"></front-elec-three>
+          <front-elec-three
+            :dashboardelecdata="dashboardelecdata"
+            :dashboarddata="dashboarddata"
+            :latest7DayData="latest7DayData"
+          >
+          </front-elec-three>
         </div>
       </div>
     </div>
@@ -160,6 +165,7 @@ import dayjs from "dayjs";
 import {selectLast,selectMonth,selecctfiftyday} from "@/api/aspen/dashboarddayelec";
 import {selectWeek} from "@/api/aspen/dashboarddayeleceight";
 import {getRealtimeByMaxDate} from "@/api/aspen/realtime.js";
+import {listDayLatest7} from "@/api/aspen/day.js";
 export default {
   data() {
     return {
@@ -176,6 +182,9 @@ export default {
       bgCol0:"#0a84ff",
       wh:"3.25rem",
       tAlign:"left",
+      // 最近7天的数据
+      latest7DayData: [],
+      // 电厂大屏实时数据
       dashboardelecdata: {
         pageNum: 1,
         pageSize: 20,
@@ -218,7 +227,13 @@ export default {
         dataDate: null,
         dateDay: null
       },
-      dashboarddata: {},
+      dashboarddata: {
+        latest7DayData:[],
+        rainPh: null,
+        rainCod: null,
+        wastePh: null,
+        wasteCod: null
+      },
       monthData:{
         pageNum: 1,
         pageSize: 20,
@@ -354,6 +369,8 @@ export default {
     window.setInterval(() => {
       this.getRealtimeData();
     }, 5000);
+    // 抓取最近7天的数据
+    this.getLatest7DayData();
 
     // this.getList1();
     // this.getMonthList1();
@@ -392,78 +409,87 @@ export default {
     // }, 1000 * 10 * 6 * 60 * 6)
   },
   methods: {
+    /** 抓取最近7天的数据 */
+    getLatest7DayData() {
+      listDayLatest7().then(response => {
+        // 最近7天的数据
+        let data = response.rows;
+        for (let i = 0; i < data.length; i++) {
+          this.latest7DayData.push(data[i]);
+          this.dashboarddata.latest7DayData.push(data[i]);
+        }
+      });
+    },
+    /** 抓取实时数据 */
     getRealtimeData() {
       getRealtimeByMaxDate().then(response => {
         // 电厂大屏实时数据
-        let realtimeData = response.data;
+        let data = response.data;
         // 第一页
-        this.dashboardelecdata.gtg1Lv = realtimeData.gtg1PowerGenLevel;
-        this.dashboardelecdata.gtg2Lv = realtimeData.gtg2PowerGenLevel;
-        this.dashboardelecdata.gtg3Lv = realtimeData.gtg3PowerGenLevel;
-        this.dashboardelecdata.stg1Lv = realtimeData.stgPowerGenLevel;
-        this.dashboardelecdata.mwhLv = realtimeData.totalPowerGen;
-        this.dashboardelecdata.mwhWr = realtimeData.totalEfficiency;
-        this.dashboardelecdata.stg1Wr = realtimeData.stgEfficiency;
-        this.dashboardelecdata.gtg3Wr = realtimeData.gtg3Efficiency;
-        this.dashboardelecdata.gtg2Wr = realtimeData.gtg2Efficiency;
-        this.dashboardelecdata.gtg1Wr = realtimeData.gtg1Efficiency;
-        this.dashboardelecdata.sub = realtimeData.sub;
-        this.dashboardelecdata.elecPowerGen = realtimeData.elecPowerGen;
-        this.dashboardelecdata.elecPowerSwitch = realtimeData.elecPowerSwitch;
-        this.dashboardelecdata.elecUsed = realtimeData.elecUsed;
-        this.dashboardelecdata.gasLeft = realtimeData.gasLeft;
-        this.dashboardelecdata.gasElec = realtimeData.gasElec;
-        this.dashboardelecdata.gasSynGas = realtimeData.gasSynGas;
-        this.dashboardelecdata.gasU2 = realtimeData.gasU2;
-        this.dashboardelecdata.gasStyrene = realtimeData.gasStyrene;
+        this.dashboardelecdata.gtg1Lv = data.gtg1PowerGenLevel;
+        this.dashboardelecdata.gtg2Lv = data.gtg2PowerGenLevel;
+        this.dashboardelecdata.gtg3Lv = data.gtg3PowerGenLevel;
+        this.dashboardelecdata.stg1Lv = data.stgPowerGenLevel;
+        this.dashboardelecdata.mwhLv = data.totalPowerGen;
+        this.dashboardelecdata.mwhWr = data.totalEfficiency;
+        this.dashboardelecdata.stg1Wr = data.stgEfficiency;
+        this.dashboardelecdata.gtg3Wr = data.gtg3Efficiency;
+        this.dashboardelecdata.gtg2Wr = data.gtg2Efficiency;
+        this.dashboardelecdata.gtg1Wr = data.gtg1Efficiency;
+        this.dashboardelecdata.sub = data.sub;
+        this.dashboardelecdata.elecPowerGen = data.elecPowerGen;
+        this.dashboardelecdata.elecPowerSwitch = data.elecPowerSwitch;
+        this.dashboardelecdata.elecUsed = data.elecUsed;
+        this.dashboardelecdata.gasLeft = data.gasLeft;
+        this.dashboardelecdata.gasElec = data.gasElec;
+        this.dashboardelecdata.gasSynGas = data.gasSynGas;
+        this.dashboardelecdata.gasU2 = data.gasU2;
+        this.dashboardelecdata.gasStyrene = data.gasStyrene;
         // 第二页
-        this.dashboardelecdata.hhpPphhp = realtimeData.hhpPphhp;
-        this.dashboardelecdata.hhpAaae = realtimeData.hhpAaae;
-        this.dashboardelecdata.hhpGaa = realtimeData.hhpGaa;
-        this.dashboardelecdata.hhpSyn = realtimeData.hhpSyn;
-        this.dashboardelecdata.hhpP3802 = realtimeData.hhpP3802;
-        this.dashboardelecdata.hpLpg = realtimeData.hpLpg;
-        this.dashboardelecdata.hpSub = realtimeData.hpSub;
-        this.dashboardelecdata.hpNg = realtimeData.hpNg;
-        this.dashboardelecdata.hpJ1501 = realtimeData.hpJ1501;
-        this.dashboardelecdata.hpJ1504In = realtimeData.hpJ1504In;
-        this.dashboardelecdata.hpJ1504Out = realtimeData.hpJ1504Out;
-        this.dashboardelecdata.hpUser = realtimeData.hpUser;
-        this.dashboardelecdata.mpNcipMp = realtimeData.mpNcipMp;
-        this.dashboardelecdata.mp150511 = realtimeData.mp150511;
-        this.dashboardelecdata.mp150512 = realtimeData.mp150512;
-        this.dashboardelecdata.mpPpMp = realtimeData.mpPpMp;
-        this.dashboardelecdata.mpP9801In = realtimeData.mpP9801In;
-        this.dashboardelecdata.mpP9801Out = realtimeData.mpP9801Out;
-        this.dashboardelecdata.mpJ1502 = realtimeData.mpJ1502;
-        this.dashboardelecdata.mpUser = realtimeData.mpUser;
-        this.dashboardelecdata.lpPpLp = realtimeData.lpPpLp;
-        this.dashboardelecdata.lpEmpty = realtimeData.lpEmpty;
-        this.dashboardelecdata.lpMpLetdown = realtimeData.lpMpLetdown;
-        this.dashboardelecdata.lpJ1509 = realtimeData.lpJ1509;
-        this.dashboardelecdata.lpJ1503 = realtimeData.lpJ1503;
-        this.dashboardelecdata.lpLdpeTs = realtimeData.lpLdpeTs;
-        this.dashboardelecdata.lpLdpeDm = realtimeData.lpLdpeDm;
-        this.dashboardelecdata.lpUser = realtimeData.lpUser;
-        this.dashboardelecdata.bccYpc = realtimeData.bccYpc;
-        this.dashboardelecdata.bccSyn = realtimeData.bccSyn;
+        this.dashboardelecdata.hhpPphhp = data.hhpPphhp;
+        this.dashboardelecdata.hhpAaae = data.hhpAaae;
+        this.dashboardelecdata.hhpGaa = data.hhpGaa;
+        this.dashboardelecdata.hhpSyn = data.hhpSyn;
+        this.dashboardelecdata.hhpP3802 = data.hhpP3802;
+        this.dashboardelecdata.hpLpg = data.hpLpg;
+        this.dashboardelecdata.hpSub = data.hpSub;
+        this.dashboardelecdata.hpNg = data.hpNg;
+        this.dashboardelecdata.hpJ1501 = data.hpJ1501;
+        this.dashboardelecdata.hpJ1504In = data.hpJ1504In;
+        this.dashboardelecdata.hpJ1504Out = data.hpJ1504Out;
+        this.dashboardelecdata.hpUser = data.hpUser;
+        this.dashboardelecdata.mpNcipMp = data.mpNcipMp;
+        this.dashboardelecdata.mp150511 = data.mp150511;
+        this.dashboardelecdata.mp150512 = data.mp150512;
+        this.dashboardelecdata.mpPpMp = data.mpPpMp;
+        this.dashboardelecdata.mpP9801In = data.mpP9801In;
+        this.dashboardelecdata.mpP9801Out = data.mpP9801Out;
+        this.dashboardelecdata.mpJ1502 = data.mpJ1502;
+        this.dashboardelecdata.mpUser = data.mpUser;
+        this.dashboardelecdata.lpPpLp = data.lpPpLp;
+        this.dashboardelecdata.lpEmpty = data.lpEmpty;
+        this.dashboardelecdata.lpMpLetdown = data.lpMpLetdown;
+        this.dashboardelecdata.lpJ1509 = data.lpJ1509;
+        this.dashboardelecdata.lpJ1503 = data.lpJ1503;
+        this.dashboardelecdata.lpLdpeTs = data.lpLdpeTs;
+        this.dashboardelecdata.lpLdpeDm = data.lpLdpeDm;
+        this.dashboardelecdata.lpUser = data.lpUser;
+        this.dashboardelecdata.bccYpc = data.bccYpc;
+        this.dashboardelecdata.bccSyn = data.bccSyn;
         // 第三页
-        this.dashboardelecdata.hrsg1SmokeConvert = realtimeData.hrsg1SmokeConvert;
-        this.dashboardelecdata.hrsg1So2Convert = realtimeData.hrsg1So2Convert;
-        this.dashboardelecdata.hrsg1NoxConvert = realtimeData.hrsg1NoxConvert;
-        this.dashboardelecdata.hrsg2SmokeConvert = realtimeData.hrsg2SmokeConvert;
-        this.dashboardelecdata.hrsg2So2Convert = realtimeData.hrsg2So2Convert;
-        this.dashboardelecdata.hrsg2NoxConvert = realtimeData.hrsg2NoxConvert;
-        this.dashboardelecdata.hrsg3SmokeConvert = realtimeData.hrsg3SmokeConvert;
-        this.dashboardelecdata.hrsg3So2Convert = realtimeData.hrsg3So2Convert;
-        this.dashboardelecdata.hrsg3NoxConvert = realtimeData.hrsg3NoxConvert;
-
-        this.dashboarddata.rainPh = realtimeData.rainPh;
-        this.dashboarddata.rainCod = realtimeData.rainCod;
-        this.dashboarddata.wastePh = realtimeData.wastePh;
-        this.dashboarddata.wasteCod = realtimeData.wasteCod;
-
-
+        this.dashboardelecdata.hrsg1SmokeConvert = data.hrsg1SmokeConvert;
+        this.dashboardelecdata.hrsg1So2Convert = data.hrsg1So2Convert;
+        this.dashboardelecdata.hrsg1NoxConvert = data.hrsg1NoxConvert;
+        this.dashboardelecdata.hrsg2SmokeConvert = data.hrsg2SmokeConvert;
+        this.dashboardelecdata.hrsg2So2Convert = data.hrsg2So2Convert;
+        this.dashboardelecdata.hrsg2NoxConvert = data.hrsg2NoxConvert;
+        this.dashboardelecdata.hrsg3SmokeConvert = data.hrsg3SmokeConvert;
+        this.dashboardelecdata.hrsg3So2Convert = data.hrsg3So2Convert;
+        this.dashboardelecdata.hrsg3NoxConvert = data.hrsg3NoxConvert;
+        this.dashboarddata.rainPh = data.rainPh;
+        this.dashboarddata.rainCod = data.rainCod;
+        this.dashboarddata.wastePh = data.wastePh;
+        this.dashboarddata.wasteCod = data.wasteCod;
       });
     },
     /** 查询dashboarddayelec抓取数据列表 */

ui/src/views/monitor/elec/frontElecThree.vue

@@ -6,7 +6,7 @@
         <!-- HRSG #1 -->
         <dv-border-box-1 class="outer-div">
           <div class="inner-div">
-            <analysisTopLeft class="analysis-top"></analysisTopLeft>
+            <analysisTopLeft class="analysis-top" v-bind="$attrs"></analysisTopLeft>
           </div>
           <div class="inner-div">
             <div class="analysis-percentage-box">
@@ -26,7 +26,7 @@
         <!-- HRSG #2 -->
         <dv-border-box-1 class="outer-div">
           <div class="inner-div">
-            <analysisTopCenter class="analysis-top"></analysisTopCenter>
+            <analysisTopCenter class="analysis-top" v-bind="$attrs"></analysisTopCenter>
           </div>
           <div class="inner-div">
             <div class="analysis-percentage-box">
@@ -46,7 +46,7 @@
         <!-- HRSG #3 -->
         <dv-border-box-1 class="outer-div">
           <div class="inner-div">
-            <analysisTopRight class="analysis-top"></analysisTopRight>
+            <analysisTopRight class="analysis-top" v-bind="$attrs"></analysisTopRight>
           </div>
           <div class="inner-div">
             <div class="analysis-percentage-box">
@@ -76,9 +76,9 @@
           </div>
           <div class="analysis-bottom-box">
             <!-- PH 折线图 -->
-            <analysisBottomLeft3 class="analysis-bottom"></analysisBottomLeft3>
+            <analysisBottomLeft3 class="analysis-bottom" v-bind="$attrs"></analysisBottomLeft3>
             <!-- COD 折线图 -->
-            <analysisBottomLeft4 class="analysis-bottom"></analysisBottomLeft4>
+            <analysisBottomLeft4 class="analysis-bottom" v-bind="$attrs"></analysisBottomLeft4>
           </div>
         </dv-border-box-13>
         <div id="scroll-board-box">