소스 검색

电厂大屏 - “天然气平衡”改为“天然气消耗量”,横坐标改为24小时

wangggziwen 2 년 전
부모
커밋
b23468362b
2개의 변경된 파일22개의 추가작업 그리고 16개의 파일을 삭제
  1. 1 1
      ui/src/views/monitor/elec/bottomRight.vue
  2. 21 15
      ui/src/views/monitor/elec/echart/bottom/bottomRightChart.vue

+ 1 - 1
ui/src/views/monitor/elec/bottomRight.vue

@@ -7,7 +7,7 @@
         </span>
 
         <div class="d-flex">
-          <span class="fs-xl text mx-2">天然气平衡</span>
+          <span class="fs-xl text mx-2">天然气消耗量</span>
           <div class="decoration2">
             <dv-decoration-2 :reverse="true" style="width:5px;height:300px;" />
           </div>

+ 21 - 15
ui/src/views/monitor/elec/echart/bottom/bottomRightChart.vue

@@ -262,15 +262,18 @@ export default {
       let latestDate = null;
       let data = this.latest24HourData;
       for (let i = 0; i < data.length; i++) {
-        if (i == 0) {
-          latestDate = data[i].pullDate.toString().substr(5, 5);
-        } else if (latestDate == data[i].pullDate.toString().substr(5, 5)) {
-          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);
-          gasArray.push(data[i].gasUsed);
-        }
+        // if (i == 0) {
+        //   latestDate = data[i].pullDate.toString().substr(5, 5);
+        // } else if (latestDate == data[i].pullDate.toString().substr(5, 5)) {
+        //   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);
+        //   gasArray.push(data[i].gasUsed);
+        // }
+        let pullDate = new Date(data[i].pullDate);
+        hourArray.push(pullDate.getHours() + ":00");
+        gasArray.push(data[i].gasUsed);
       }
       hourArray.reverse();
       gasArray.reverse();
@@ -381,12 +384,15 @@ export default {
       let latestDate = null;
       let data = this.latest24HourData;
       for (let i = 0; i < data.length; i++) {
-        if (i == 0) {
-          latestDate = data[i].pullDate.toString().substr(5, 5);
-        } else if (latestDate == data[i].pullDate.toString().substr(5, 5)) {
-          hourArray.push(data[i].pullDate.toString().substr(14, 5));
-          gasArray.push(data[i].gasUsed);
-        }
+        // if (i == 0) {
+        //   latestDate = data[i].pullDate.toString().substr(5, 5);
+        // } else if (latestDate == data[i].pullDate.toString().substr(5, 5)) {
+        //   hourArray.push(data[i].pullDate.toString().substr(14, 5));
+        //   gasArray.push(data[i].gasUsed);
+        // }
+        let pullDate = new Date(data[i].pullDate);
+        hourArray.push(pullDate.getHours() + ":00");
+        gasArray.push(data[i].gasUsed);
       }
       hourArray.reverse();
       gasArray.reverse();