修复光伏矩阵预测功率及设备功率曲线展示、修复指标列表页装机容量展示、优化刷新页面不展示升压站名称

src/App.vue

@@ -127,8 +127,6 @@ export default {
         fontsize: "16px",
         transform: "scaleY(1) scaleX(1) translate(-50%, -50%)",
       },
-
- 
     };
   },
   computed: {
@@ -141,7 +139,6 @@ export default {
     menuLength() {
       return this.$store.state.menuData.length;
     },
-  
   },
   created() {},
   mounted() {
@@ -156,7 +153,6 @@ export default {
     console.log("离开标记", this.socketLeaveFlag);
   },
   methods: {
- 
     getScale() {
       const w = window.innerWidth / this.style.width;
       const h = window.innerHeight / this.style.height;
@@ -204,8 +200,7 @@ export default {
     },
     login() {
       this.$store.commit("user/SET_LOGINSTATE", true);
-      this.getBooster();
-      this.getCftlist();
+
       // websocket启动
       //   this.createWebSocket();
     },
@@ -225,6 +220,9 @@ export default {
           this.socketLeaveFlag = true;
           // 关闭WebSocket
           this.socketObj.close();
+        } else {
+          this.getBooster();
+          this.getCftlist();
         }
       },
       immediate: true,

src/views/stateMonitor/factoryMonitor/photovoltaic/lightDataTarget/index.vue

@@ -56,13 +56,13 @@
           <template #header>
             <div v-if="item.name.length > 6">
               {{ item.name }}
-              <span v-if="index > 1 && item.valueUnit"
+              <span v-if="item.valueUnit"
                 >({{ item.valueUnit ? item.valueUnit : "--" }})</span
               >
             </div>
             <div v-else>
               <div>{{ item.name }}</div>
-              <div v-if="index > 1 && item.valueUnit">
+              <div v-if="item.valueUnit">
                 ({{ item.valueUnit ? item.valueUnit : "--" }})
               </div>
             </div>
@@ -173,7 +173,7 @@ export default {
       if (localLightTargets[1].name == "装机容量") {
         localStorage.removeItem("lightlocalData");
         this.uniformDetial = Array.from(
-        new Set([
+          new Set([
             {
               name: "设备名称",
               uniformCode: "SBAMC",
@@ -324,12 +324,12 @@ export default {
         }
         newList1.push({
           SBAMC: item.wpname,
-          SBXH: item.capacity,
+          SBXH: item.capacity / 1000,
           ...this.getNewObj(a, c),
         });
         newList.push({
           SBAMC: item.wpname,
-          SBXH: item.capacity,
+          SBXH: item.capacity / 1000,
           ...this.getNewObj(a, b),
         });
       });

src/views/stateMonitor/factoryMonitor/photovoltaic/lightMatrixMonitor/index.vue

@@ -92,7 +92,7 @@
                 singleMatrixInfo[item.code]
                   ? item.code == "speed"
                     ? singleMatrixInfo[item.code]?.toFixed(2)
-                    : (singleMatrixInfo[item.code] / 1000)?.toFixed(2)
+                    : singleMatrixInfo[item.code]?.toFixed(2)
                   : "0.00"
               }}
             </div>

src/views/stateMonitor/factoryMonitor/photovoltaic/lighthome/index.vue

@@ -77,10 +77,8 @@
             style="width: 100%; height: calc(100% - 39px); margin-top: 10px"
             v-if="showFlag"
           >
-            <power-echarts
-              :predictFlag="true"
+           <power-echarts
               :CurveValues="powerList"
-              :ratio="1000"
               width="100%"
               unit="MW"
               height="100%"
@@ -252,6 +250,7 @@ import dayjs from "dayjs";
 import PieChart from "@/views/stateMonitor/factoryMonitor/windPowerPlant/components/pieChart";
 import BarCharts from "@/views/stateMonitor/factoryMonitor/windPowerPlant/components/barCharts";
 import LineCharts from "@/views/stateMonitor/factoryMonitor/windPowerPlant/components/lineCharts";
+import { FindPowerInfo } from "@/api/home/home.js";
 export default {
   name: "lighthome", //光伏场站
   components: {
@@ -753,36 +752,93 @@ export default {
         this.getJrPoints(pointId);
       });
     },
+    // // 查询24小时功率数据
+    // getPoints(pointIds) {
+    //   GetPointFitting({
+    //     begin: dayjs().startOf("date").format("YYYY-MM-DD HH:mm:ss"),
+    //     end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+    //     interval: 60 * 30,
+    //     pointIds,
+    //   }).then((res) => {
+    //     if (res.data.data.length) {
+    //       let powerLineChartData = [];
+    //       let resData = res.data.data;
+    //       resData.forEach((value, index) => {
+    //         var option = {
+    //           title:
+    //             this.ined == 3
+    //               ? this.tmpData[index].stse + this.tmpData[index].statiomName
+    //               : this.tmpData[index].statiomName,
+    //           tagName: this.tmpData[index].sts,
+    //           yAxisIndex: 0,
+    //           value: value.map((item) => {
+    //             return {
+    //               dateTime: item.pointTime,
+    //               value: item.pointValueInDouble,
+    //             };
+    //           }),
+    //           noRatio: true,
+    //         };
+    //         powerLineChartData.push(option);
+    //       });
+    //       this.powerList = powerLineChartData;
+    //     }
+    //   });
+    // },
     // 查询24小时功率数据
-    getPoints(pointIds) {
-      GetPointFitting({
-        begin: dayjs().startOf("date").format("YYYY-MM-DD HH:mm:ss"),
-        end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        interval: 60 * 30,
-        pointIds,
-      }).then((res) => {
-        if (res.data.data.length) {
-          let powerLineChartData = [];
-          let resData = res.data.data;
-          resData.forEach((value, index) => {
-            var option = {
-              title:
-                this.ined == 3
-                  ? this.tmpData[index].stse + this.tmpData[index].statiomName
-                  : this.tmpData[index].statiomName,
-              tagName: this.tmpData[index].sts,
-              yAxisIndex: 0,
-              value: value.map((item) => {
-                return {
-                  dateTime: item.pointTime,
-                  value: item.pointValueInDouble,
-                };
-              }),
-              noRatio: true,
+    getPoints() {
+      FindPowerInfo({ id: this.stationCode }).then((res) => {
+        if (res.data) {
+          let Powertrend = {
+            // 图表所用单位
+            units: ["(万KWh)", ""],
+            value: [
+              {
+                title: "预测功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+              {
+                title: "理论功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+              {
+                title: "实际功率",
+                smooth: true, // 使用单位
+                value: [],
+              },
+            ],
+          };
+
+          Powertrend.value[0].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.bzgl,
+            };
+          });
+          Powertrend.value[1].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.llgl,
+            };
+          });
+          Powertrend.value[2].value = res.data.map((item) => {
+            return {
+              dateTime: dayjs()
+                .startOf("date")
+                .add(item.hours, "hour")
+                .format("YYYY-MM-DD HH:mm:ss"),
+              value: item.sjgl,
             };
-            powerLineChartData.push(option);
           });
-          this.powerList = powerLineChartData;
+          this.powerList = Powertrend.value;
         }
       });
     },
@@ -792,7 +848,7 @@ export default {
       GetPointFitting({
         begin: dayjs().startOf("date").format("YYYY-MM-DD HH:mm:ss"),
         end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        interval: 60 * 30,
+        interval: 60 * 60,
         pointIds: pointId,
       }).then((res) => {
         if (res.data.data.length) {
@@ -821,7 +877,7 @@ export default {
           .subtract(1, "days")
           .endOf("date")
           .format("YYYY-MM-DD HH:mm:ss"),
-        interval: 60 * 30,
+        interval: 60 * 60,
         pointIds: pointId,
       }).then((res) => {
         if (res.data.data.length) {

src/views/stateMonitor/factoryMonitor/windPowerPlant/DataTarget/index.vue

@@ -56,13 +56,13 @@
           <template #header>
             <div v-if="item.name.length > 6">
               {{ item.name }}
-              <span v-if="index > 1 && item.valueUnit"
+              <span v-if="item.valueUnit"
                 >({{ item.valueUnit ? item.valueUnit : "--" }})</span
               >
             </div>
             <div v-else>
               <div>{{ item.name }}</div>
-              <div v-if="index > 1 && item.valueUnit">
+              <div v-if="item.valueUnit">
                 ({{ item.valueUnit ? item.valueUnit : "--" }})
               </div>
             </div>
@@ -318,12 +318,12 @@ export default {
         }
         newList1.push({
           SBAMC: item.wpname,
-          SBXH: item.capacity,
+          SBXH: item.capacity / 1000,
           ...this.getNewObj(a, c),
         });
         newList.push({
           SBAMC: item.wpname,
-          SBXH: item.capacity,
+          SBXH: item.capacity / 1000,
           ...this.getNewObj(a, b),
         });
       });

src/views/stateMonitor/factoryMonitor/windPowerPlant/windhome/index.vue

@@ -814,7 +814,7 @@ export default {
       GetPointFitting({
         begin: dayjs().startOf("date").format("YYYY-MM-DD HH:mm:ss"),
         end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        interval: 60 * 30,
+        interval: 60 * 60,
         pointIds: pointId,
       }).then((res) => {
         if (res.data.data.length) {
@@ -843,7 +843,7 @@ export default {
           .subtract(1, "days")
           .endOf("date")
           .format("YYYY-MM-DD HH:mm:ss"),
-        interval: 60 * 30,
+        interval: 60 * 60,
         pointIds: pointId,
       }).then((res) => {
         if (res.data.data.length) {

src/views/stateMonitor/zhzb/zhzb.vue

@@ -312,12 +312,12 @@ export default {
         }
         newList1.push({
           CZMC: item.wpname,
-          ZJRL: item.capacity,
+          ZJRL: item.capacity / 1000,
           ...this.getNewObj(a, c),
         });
         newList.push({
           CZMC: item.wpname,
-          ZJRL: item.capacity,
+          ZJRL: item.capacity / 1000,
           ...this.getNewObj(a, b),
         });
       });