电厂大屏 - 天然气日消耗情况取值修改

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

@@ -20,6 +20,8 @@ public class TElecdashboardDay extends BaseEntity
     /** $column.columnComment */
     private Long id;
 
+    private String gasYesterday;     // 昨日天然气消耗量
+
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Date pullDate;
@@ -2890,6 +2892,14 @@ public class TElecdashboardDay extends BaseEntity
         return totalEfficiency;
     }
 
+    public String getGasYesterday() {
+        return gasYesterday;
+    }
+
+    public void setGasYesterday(String gasYesterday) {
+        this.gasYesterday = gasYesterday;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ui/src/views/monitor/elec/echart/bottom/bottomRightChart1.vue

@@ -40,7 +40,7 @@ export default {
       for (let i = 0; i < this.latest30DayData.length; i++) {
         dateArray[i]=  this.latest30DayData[i].pullDate.toString().substr(5, 5);
         planArray[i] = this.latest30DayData[i].gasPlan;
-        actualArray[i] = this.latest30DayData[i].gasUsed;
+        actualArray[i] = this.latest30DayData[i].gasYesterday;
       }
       dateArray.reverse();
       planArray.reverse();
@@ -124,7 +124,7 @@ export default {
       for (let i = 0; i < this.latest30DayData.length; i++) {
         dateArray[i]=  this.latest30DayData[i].pullDate.toString().substr(5, 5);
         planArray[i] = this.latest30DayData[i].gasPlan;
-        actualArray[i] = this.latest30DayData[i].gasUsed;
+        actualArray[i] = this.latest30DayData[i].gasYesterday;
       }
       dateArray.reverse();
       planArray.reverse();

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

@@ -508,6 +508,7 @@ export default {
         this.dashboardelecdata.gasU2 = data.gasU2;
         this.dashboardelecdata.gasStyrene = data.gasStyrene;
         this.dashboardelecdata.gasPlan = data.gasPlan;
+        this.dashboardelecdata.gasYesterday = data.gasYesterday;
         // 第二页
         this.dashboardelecdata.hhpPphhp = data.hhpPphhp;
         this.dashboardelecdata.hhpAaae = data.hhpAaae;