电厂大屏 - 每日煤耗状态横坐标范围改为30天，纵坐标单位改为tce

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

@@ -71,7 +71,7 @@
 import centerChart from "./echart/center/centerChartRate";
 
 export default {
-  props: ['dashboardelecdata', 'latest24HourData'],
+  props: ['dashboardelecdata', 'latest24HourData', 'latest30DayData'],
   data() {
     return {
       openChart: false,
@@ -271,15 +271,22 @@ export default {
       this.chart = this.echarts.init(document.getElementById('naturalGasChart'))
       const hourArray = [];
       const carbonArray = [];
-      let data = this.latest24HourData;
+      let data = this.latest30DayData;
       for (let i = 0; i < data.length; i++) {
-        if (i % 4 == 0) {
-          let dateString = data[i].pullDate.toString().substr(
-            data[i].pullDate.toString().indexOf("T") + 1,
-            data[i].pullDate.toString().indexOf(".000") - data[i].pullDate.toString().indexOf("T") - 4);
-          hourArray.push(dateString);
-          carbonArray.push(data[i].carbonRealTime=="#VALUE!"?"0":data[i].carbonRealTime);
+        // if (i % 4 == 0) {
+        //   let dateString = data[i].pullDate.toString().substr(
+        //     data[i].pullDate.toString().indexOf("T") + 1,
+        //     data[i].pullDate.toString().indexOf(".000") - data[i].pullDate.toString().indexOf("T") - 4);
+        //   hourArray.push(dateString);
+        //   carbonArray.push(data[i].carbonRealTime=="#VALUE!"?"0":data[i].carbonRealTime);
+        // }
+        let pullDate = new Date(data[i].pullDate);
+        hourArray.push(pullDate.getMonth() + 1 + "-" + pullDate.getDate());
+        let carbonUsed = data[i].carbonUsed;
+        if (carbonUsed == "#VALUE!" || carbonUsed == null) {
+          carbonUsed = "0";
         }
+        carbonArray.push(carbonUsed);
       }
       hourArray.reverse();
       carbonArray.reverse();
@@ -293,7 +300,7 @@ export default {
         },
         yAxis: {
           type: 'value',
-          name:  'Unit:(t)',
+          name:  'Unit:(tce)',
           axisLabel: {
             color: '#ffffff'
           },
@@ -386,15 +393,22 @@ export default {
       this.chart1 = this.echarts.init(document.getElementById('naturalGasChartDialog'))
       const hourArray = [];
       const carbonArray = [];
-      let data = this.latest24HourData;
+      let data = this.latest30DayData;
       for (let i = 0; i < data.length; i++) {
-        if (i % 4 == 0) {
-          let dateString = data[i].pullDate.toString().substr(
-            data[i].pullDate.toString().indexOf("T") + 1, 
-            data[i].pullDate.toString().indexOf(".000") - data[i].pullDate.toString().indexOf("T") - 4);
-          hourArray.push(dateString);
-          carbonArray.push(data[i].carbonRealTime=="#VALUE!"?"0":data[i].carbonRealTime);
+        // if (i % 4 == 0) {
+        //   let dateString = data[i].pullDate.toString().substr(
+        //     data[i].pullDate.toString().indexOf("T") + 1,
+        //     data[i].pullDate.toString().indexOf(".000") - data[i].pullDate.toString().indexOf("T") - 4);
+        //   hourArray.push(dateString);
+        //   carbonArray.push(data[i].carbonRealTime=="#VALUE!"?"0":data[i].carbonRealTime);
+        // }
+        let pullDate = new Date(data[i].pullDate);
+        hourArray.push(pullDate.getMonth() + 1 + "-" + pullDate.getDate());
+        let carbonUsed = data[i].carbonUsed;
+        if (carbonUsed == "#VALUE!" || carbonUsed == null) {
+          carbonUsed = "0";
         }
+        carbonArray.push(carbonUsed);
       }
       hourArray.reverse();
       carbonArray.reverse();
@@ -405,7 +419,7 @@ export default {
         },
         yAxis: {
           type: 'value',
-          name:  'Unit:(t)'
+          name:  'Unit:(tce)'
         },
         series: [
           {

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

@@ -70,7 +70,7 @@
           </div>
           <!-- 中间 -->
           <div>
-            <center :dashboardelecdata="dashboardelecdata" :latest24HourData="latest24HourData" />
+            <center :dashboardelecdata="dashboardelecdata" :latest24HourData="latest24HourData" :latest30DayData="latest30DayData" />
           </div>
           <!-- 中间 -->
           <div>