王子文 电厂大屏

master/src/main/java/com/ruoyi/project/aspen/domain/TElecdashboardRealtime.java

@@ -60,6 +60,10 @@ public class TElecdashboardRealtime extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String totalPowerGen;
 
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String totalEfficiency;
+
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String steamHhp;
@@ -896,6 +900,14 @@ public class TElecdashboardRealtime extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String hrsg3Qi32242;
 
+    public String getTotalEfficiency() {
+        return totalEfficiency;
+    }
+
+    public void setTotalEfficiency(String totalEfficiency) {
+        this.totalEfficiency = totalEfficiency;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

master/src/main/resources/mybatis/aspen/TElecdashboardRealtimeMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stgPowerGenLevel"    column="stg_power_gen_level"    />
         <result property="stgEfficiency"    column="stg_efficiency"    />
         <result property="totalPowerGen"    column="total_power_gen"    />
+        <result property="totalEfficiency"    column="total_efficiency"    />
         <result property="steamHhp"    column="steam_hhp"    />
         <result property="steamHp"    column="steam_hp"    />
         <result property="steamMp"    column="steam_mp"    />
@@ -260,7 +261,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             d.hrsg3_ai82403, d.hrsg3_ai82404, d.hrsg3_ai82405, d.hrsg3_ai82406, d.hrsg3_ai82407, d.hrsg3_ai82408,
             d.hrsg3_ai82409, d.hrsg3_ai82410, d.hrsg3_ai82411, d.hrsg3_ai82412, d.hrsg3_air32551, d.hrsg3_air32552,
             d.hrsg3_air32553, d.hrsg3_air32554, d.hrsg3_air32555, d.hrsg3_air32556, d.hrsg3_air32557, d.hrsg3_air32558,
-            d.hrsg3_qi32240, d.hrsg3_qi32241, d.hrsg3_qi32242
+            d.hrsg3_qi32240, d.hrsg3_qi32241, d.hrsg3_qi32242, d.total_efficiency
         from
             t_elecdashboard_realtime d
     </sql>

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

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

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

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

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

@@ -22,31 +22,31 @@
         <div style="padding-top:10px;">
           <div style="display:flex;flex-direction:row; margin-bottom: 10px;height:30px;">
             <p class="ml-3 colorBlue fw-b bottom-right-text" style="padding-right:17px;margin:0px;">电厂</p>
-            <div class="fontElec1">755.0</div>
+            <div class="fontElec1">{{this.dashboardelecdata.gasElec}}</div>
           </div>
         </div>
         <div style="display:flex;flex-direction:row; margin-bottom: 10px;height:30px;">
           <p class="ml-3 colorBlue fw-b bottom-right-text" style="margin:0px;">合成气</p>
           <div>
-            <div class="fontElec1">778.0</div>
+            <div class="fontElec1">{{this.dashboardelecdata.gasSynGas}}</div>
           </div>
         </div>
         <div style="display:flex;flex-direction:row; margin-bottom: 10px;height:30px;">
           <p class="ml-3 colorBlue fw-b bottom-right-text" style="padding-right:36px;margin:0px;">U2</p>
           <div>
-            <div class="fontElec1" style="margin-left: 0.34rem;">756.0</div>
+            <div class="fontElec1" style="margin-left: 0.34rem;">{{this.dashboardelecdata.gasU2}}</div>
           </div>
         </div>
         <div style="display:flex;flex-direction:row; margin-bottom: 10px;height:30px;">
           <p class="ml-3 colorBlue fw-b bottom-right-text" style="margin:0px;">苯乙烯</p>
           <div style="float: top">
-            <div class="fontElec1">733.0</div>
+            <div class="fontElec1">{{this.dashboardelecdata.gasStyrene}}</div>
           </div>
         </div>
         <div style="display:flex;flex-direction:row; margin-bottom: 10px;height:30px;">
           <p class="ml-3 colorBlue fw-b bottom-right-text" style="margin:0px;">日剩余量</p>
           <div style="float: top">
-            <div class="fontElec1" style="margin-left: 0.2rem;">733.0</div>
+            <div class="fontElec1" style="margin-left: 0.2rem;">{{this.dashboardelecdata.gasLeft}}</div>
           </div>
         </div>
       </div>
@@ -60,7 +60,7 @@
 <script>
 import bottomRightChart from "./echart/bottom/bottomRightChart";
 export default {
-  props:['weekData'],
+  props:['weekData','dashboardelecdata'],
   data() {
     return {
       openChart: false,

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

@@ -159,7 +159,7 @@ export default {
         unit: "mw"
       },
       water: {
-        data: [24, 45],
+        data: [this.dashboardelecdata.sub],
         shape: "roundRect",
         formatter: "SUB {value}%",
         waveNum: 3

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

@@ -3,14 +3,14 @@
     <div class="bg-color-black">
 
       <div class="d-flex jc-center body-box center-text" style=" margin-top: 0;height: 60px">
-        <div class="fontElec"><p class="title-p">发电量</p><p class="title-p2">{{this.dashboarddayelec.ypg}}</p></div>
+        <div class="fontElec"><p class="title-p">发电量</p><p class="title-p2">{{this.dashboarddayelec.elecPowerGen}}</p></div>
       </div>
       <div class="d-flex jc-center body-box center-text" style=" margin-top: 0;height: 60px">
-        <div class="fontElec"><p class="title-p">倒电量</p> <p class="title-p2">{{this.dashboarddayelec.daodianliang}}</p></div>
+        <div class="fontElec"><p class="title-p">倒电量</p> <p class="title-p2">{{this.dashboarddayelec.elecPowerSwitch}}</p></div>
 
       </div>
       <div class="d-flex jc-center body-box center-text" style=" margin-top: 0;height: 60px">
-        <div class="fontElec"><p class="title-p">用电量</p><p class="title-p2">{{this.dashboarddayelec.eveLec}}</p></div>
+        <div class="fontElec"><p class="title-p">用电量</p><p class="title-p2">{{this.dashboarddayelec.elecUsed}}</p></div>
 
       </div>
       <div class="d-flex pt-2 pl-2">

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

@@ -7,6 +7,7 @@
 <script>
 import echartMixins from "@/utils/resizeMixins";
 export default {
+    props: ['dashboarddata'],
     data() {
         return {
             chart: null
@@ -61,7 +62,7 @@ export default {
                     {
                         name: '实时 PH',
                         type: 'bar',
-                        data: [6,9],
+                        data: [this.dashboarddata.wastePh, this.dashboarddata.rainPh],
                         itemStyle: {
                             normal: {
                                 color: new this.echarts.graphic.LinearGradient(0, 0, 0, 1, [

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

@@ -7,6 +7,7 @@
 <script>
 import echartMixins from "@/utils/resizeMixins";
 export default {
+    props: ['dashboarddata'],
     data() {
         return {
             chart: null,
@@ -62,7 +63,7 @@ export default {
                     {
                         name: '实时 COD',
                         type: 'bar',
-                        data: [160, 200],
+                        data: [this.dashboarddata.wasteCod, this.dashboarddata.rainCod],
                         itemStyle: {
                             normal: {
                                 color: new this.echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -108,4 +109,4 @@ export default {
 
 <style>
 
-</style>
+</style>

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

@@ -90,7 +90,7 @@
           </dv-border-box-13>
           <div class="bototm-box1">
             <dv-border-box-12>
-              <bottom-right :weekData="weekData"/>
+              <bottom-right :weekData="weekData" :dashboardelecdata="dashboardelecdata"/>
             </dv-border-box-12>
             <div class="bototm-box2">
               <dv-border-box-12>
@@ -135,7 +135,7 @@
       </div>
       <div class="body-box" v-if="dashboard === 3">
         <div>
-          <front-elec-three :dashboardelecdata="dashboardelecdata"></front-elec-three>
+          <front-elec-three :dashboardelecdata="dashboardelecdata" :dashboarddata="dashboarddata"></front-elec-three>
         </div>
       </div>
     </div>
@@ -218,7 +218,7 @@ export default {
         dataDate: null,
         dateDay: null
       },
-      dashboardelecdata2: null,
+      dashboarddata: {},
       monthData:{
         pageNum: 1,
         pageSize: 20,
@@ -350,10 +350,10 @@ export default {
   created() {
     // 抓取实时数据
     this.getRealtimeData();
-    // // 每隔5秒抓取一次实时数据
-    // window.setInterval(() => {
-    //   this.getRealtimeData();
-    // }, 5000);
+    // 每隔5秒抓取一次实时数据
+    window.setInterval(() => {
+      this.getRealtimeData();
+    }, 5000);
 
     // this.getList1();
     // this.getMonthList1();
@@ -402,6 +402,20 @@ export default {
         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.hhpPphhp = realtimeData.hhpPphhp;
         this.dashboardelecdata.hhpAaae = realtimeData.hhpAaae;
@@ -443,13 +457,13 @@ export default {
         this.dashboardelecdata.hrsg3SmokeConvert = realtimeData.hrsg3SmokeConvert;
         this.dashboardelecdata.hrsg3So2Convert = realtimeData.hrsg3So2Convert;
         this.dashboardelecdata.hrsg3NoxConvert = realtimeData.hrsg3NoxConvert;
-        this.dashboardelecdata.rainPh = realtimeData.rainPh;
-        this.dashboardelecdata.rainCod = realtimeData.rainCod;
-        this.dashboardelecdata.wastePh = realtimeData.wastePh;
-        this.dashboardelecdata.wasteCod = realtimeData.wasteCod;
 
-        let dashboardelecdata2 = this.dashboardelecdata;
-        this.dashboardelecdata2 = dashboardelecdata2;
+        this.dashboarddata.rainPh = realtimeData.rainPh;
+        this.dashboarddata.rainCod = realtimeData.rainCod;
+        this.dashboarddata.wastePh = realtimeData.wastePh;
+        this.dashboarddata.wasteCod = realtimeData.wasteCod;
+
+
       });
     },
     /** 查询dashboarddayelec抓取数据列表 */

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

@@ -70,9 +70,9 @@
         <dv-border-box-13 class="outer-div">
           <div class="analysis-bottom-box">
             <!-- PH 柱状图 -->
-            <analysisBottomLeft1  class="analysis-bottom"></analysisBottomLeft1>
+            <analysisBottomLeft1 class="analysis-bottom" v-bind="$attrs"></analysisBottomLeft1>
             <!-- COD 柱状图 -->
-            <analysisBottomLeft2 class="analysis-bottom"></analysisBottomLeft2>
+            <analysisBottomLeft2 class="analysis-bottom" v-bind="$attrs"></analysisBottomLeft2>
           </div>
           <div class="analysis-bottom-box">
             <!-- PH 折线图 -->