实现光伏性能评价功能及光伏电量分析功能、修复页面中发现的bug

.env.development

@@ -1,11 +1,11 @@
 
-VUE_APP_TEST=http://10.81.3.155:9002
-# VUE_APP_TEST=http://192.168.1.106:9002
+# VUE_APP_TEST=http://10.81.3.155:9002
+VUE_APP_TEST=http://192.168.1.100:9002
 
 
 # VUE_APP_API=http://192.168.1.110:6060
 VUE_APP_API=http://10.81.3.153:6060
-# VUE_APP_API=http://192.168.1.106:6060
+# VUE_APP_API=http://192.168.1.107:6060
 
 
 VUE_APP_ADAPTERURL=http://10.81.3.155:8011

src/App.vue

@@ -83,37 +83,7 @@
       >
         <router-view />
       </div>
-      <alarmBadge />
-      <!-- <div
-        draggable="true"
-        @dragstart="startDrag"
-        @dragend="stopDrag"
-        :style="{ left: x + 'px', top: y + 'px' }"
-        style="cursor: pointer; position: absolute; z-index: 999"
-      > 
-        <el-badge
-          :value="warnLength"
-          :class="{ active: warnLength ? false : true }"
-        >
-          <div class="alarmDeligo" @click="displayAlarm" v-if="warnLength">
-            <img src="@assets/imgs/ygj.png" class="trans" />
-            <img src="@assets/imgs/ygj1.png" />
-          </div>
-          <div class="alarmDeligo" v-if="!warnLength">
-            <img src="@assets/imgs/wgj.png" class="trans" />
-            <img src="@assets/imgs/wgj1.png" />
-          </div>
-        </el-badge>
-      </div>
-      <deligo-alarm-list
-        :dialogList="dialogList.slice(0, 12)"
-        :alarmConfigArray="alarmConfigArray"
-        @setConfig="getAlarmConfig"
-        @confirm="playAudioEffect"
-        ref="deligoChild"
-        @close="displayClose"
-        v-if="displayAlarms == true"
-      ></deligo-alarm-list> -->
+      <!-- <alarmBadge /> -->
     </div>
     <div v-else class="login"><login-page @onLogin="login" /></div>
   </div>
@@ -125,12 +95,9 @@ import alarmBadge from "@/components/alarm-badge/index.vue";
 import Menu from "@/views/layout/Menu.vue";
 import Header from "@/views/layout/Header.vue";
 import LoginPage from "./views/layout/login-page.vue";
-import sisView from "./views/sisView/index.vue";
 import { GetBoosterlist } from "@/api/factoryMonitor/index.js";
 import { getApiWeatherstation } from "@/api/monthlyPerformanceAnalysis";
-import deligoAlarmList from "@/components/deligoAlarmList";
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
-import { ElNotification } from "element-plus";
 import { GetDeviceTableData } from "@/api/zhbj/index.js";
 import dayjs from "dayjs";
 import $ from "jquery";
@@ -141,7 +108,6 @@ export default {
     LoginPage,
     alarmBadge,
     SvgIcon,
-    deligoAlarmList,
   },
 
   data() {
@@ -161,111 +127,6 @@ export default {
         fontsize: "16px",
         transform: "scaleY(1) scaleX(1) translate(-50%, -50%)",
       },
-      // websocket相关
-      //升压站报警ws
-      //   socketObj: "", // websocket实例对象
-      //   //心跳检测
-      //   heartCheck: {
-      //     vueThis: this, // vue实例
-      //     timeout: 30000, // 超时时间
-      //     timeoutObj: null, // 计时器对象——向后端发送心跳检测
-      //     serverTimeoutObj: null, // 计时器对象——等待后端心跳检测的回复
-      //     // 心跳检测重置
-      //     reset: function () {
-      //       clearTimeout(this.timeoutObj);
-      //       clearTimeout(this.serverTimeoutObj);
-      //       return this;
-      //     },
-      //     // 心跳检测启动
-      //     start: function () {
-      //       this.timeoutObj && clearTimeout(this.timeoutObj);
-      //       this.serverTimeoutObj && clearTimeout(this.serverTimeoutObj);
-      //       this.timeoutObj = setTimeout(() => {
-      //         // 这里向后端发送一个心跳检测，后端收到后，会返回一个心跳回复
-      //         this.vueThis.socketObj.send("HeartBeat");
-      //         console.log("发送心跳检测");
-      //         this.serverTimeoutObj = setTimeout(() => {
-      //           // 如果超过一定时间还没重置计时器，说明websocket与后端断开了
-      //           console.log("未收到心跳检测回复");
-      //           // 关闭WebSocket
-      //           this.vueThis.socketObj.close();
-      //         }, this.timeout);
-      //       }, this.timeout);
-      //     },
-      //   },
-      //   socketReconnectTimer: null, // 计时器对象——重连
-      //   socketReconnectLock: false, // WebSocket重连的锁
-      //   socketLeaveFlag: false, // 离开标记（解决 退出登录再登录 时出现的 多次相同推送 问题，出现的本质是多次建立了WebSocket连接）
-      //实时报警弹窗ws
-      socketObj1: "", // websocket实例对象
-      //心跳检测
-      heartCheck1: {
-        vueThis1: this, // vue实例
-        timeout1: 30000, // 超时时间
-        timeoutObj1: null, // 计时器对象——向后端发送心跳检测
-        serverTimeoutObj1: null, // 计时器对象——等待后端心跳检测的回复
-        // 心跳检测重置
-        reset: function () {
-          clearTimeout(this.timeoutObj1);
-          clearTimeout(this.serverTimeoutObj1);
-          return this;
-        },
-        // 心跳检测启动
-        start: function () {
-          this.timeoutObj1 && clearTimeout(this.timeoutObj1);
-          this.serverTimeoutObj1 && clearTimeout(this.serverTimeoutObj1);
-          this.timeoutObj1 = setTimeout(() => {
-            // 这里向后端发送一个心跳检测，后端收到后，会返回一个心跳回复
-            this.vueThis1.socketObj1.send("HeartBeat");
-            console.log("发送心跳检测1");
-            this.serverTimeoutObj1 = setTimeout(() => {
-              // 如果超过一定时间还没重置计时器，说明websocket与后端断开了
-              console.log("未收到心跳检测回复1");
-              // 关闭WebSocket
-              this.vueThis1.socketObj1.close();
-            }, this.timeout1);
-          }, this.timeout1);
-        },
-      },
-      socketReconnectTimer1: null, // 计时器对象——重连
-      socketReconnectLock1: false, // WebSocket重连的锁
-      socketLeaveFlag1: false, // 离开标记（解决 退出登录再登录 时出现的 多次相同推送 问题，出现的本质是多次建立了WebSocket连接）
-      alarmList: [],
-      dialogList: [],
-      //实时报警图标相关
-      x: null,
-      y: null,
-      currentX: 0,
-      currentY: 0,
-      displayAlarms: false,
-      indexNum: 0,
-      data1: 0,
-      dragging: false,
-
-      initialX: 0,
-      initialY: 0,
-      timer: null,
-      firstTime: null,
-      lastTime: null,
-      key: false,
-      //请求参数
-      requestAlarmHistoryParams: [
-        {
-          alarmType: "booststation",
-          deviceType: "",
-        },
-        {
-          alarmType: "inverter",
-          deviceType: "",
-        },
-        {
-          alarmType: "windturbine",
-          deviceType: "",
-        },
-      ],
-      alarmConfigArray: [],
-      seriousWarning: false,
-      audioElement: null,
     };
   },
   computed: {
@@ -278,9 +139,6 @@ export default {
     menuLength() {
       return this.$store.state.menuData.length;
     },
-    warnLength() {
-      return this.$store.state.warnList.length;
-    },
   },
   created() {},
   mounted() {
@@ -295,298 +153,6 @@ export default {
     console.log("离开标记", this.socketLeaveFlag);
   },
   methods: {
-    playAudioEffect() {
-      const lv1Config = this.getConfigItem(1);
-      let lv1Play = false;
-      if (lv1Config.isAlarmSound) {
-        lv1Play = this.dialogList.some((ele) => {
-          return ele.lv === 1 && !ele.confirm;
-        });
-      }
-
-      const lv2Config = this.getConfigItem(2);
-      let lv2Play = false;
-      if (lv2Config.isAlarmSound) {
-        lv2Play = this.dialogList.some((ele) => {
-          return ele.lv === 2 && !ele.confirm;
-        });
-      }
-
-      const lv3Config = this.getConfigItem(3);
-      let lv3Play = false;
-      if (lv3Config.isAlarmSound) {
-        lv3Play = this.dialogList.some((ele) => {
-          return ele.lv === 3 && !ele.confirm;
-        });
-      }
-
-      const lv4Config = this.getConfigItem(4);
-      let lv4Play = false;
-      if (lv4Config.isAlarmSound) {
-        lv4Play = this.dialogList.some((ele) => {
-          return ele.lv === 4 && !ele.confirm;
-        });
-      }
-
-      const lv5Config = this.getConfigItem(5);
-      let lv5Play = false;
-      if (lv5Config.isAlarmSound) {
-        lv5Play = this.dialogList.some((ele) => {
-          return ele.lv === 5 && !ele.confirm;
-        });
-      }
-      //   console.log(lv1Play, lv2Play, lv3Play, lv4Play, lv5Play);
-      if (lv5Play && !this.seriousWarning) {
-        this.seriousWarning = true;
-        this.audioElement = new Audio();
-        this.audioElement.src = "./static/sound/lv5.mp3";
-        this.audioElement.loop = true;
-        this.audioElement?.play();
-      } else if (
-        (lv1Play || lv2Play || lv3Play || lv4Play) &&
-        !this.seriousWarning
-      ) {
-        this.audioElement = new Audio();
-        this.audioElement.src = "./static/sound/lv4.mp3";
-        this.audioElement.addEventListener("ended", () => {
-          this.audioElement?.removeEventListener(
-            "ended",
-            this.stopPlayAudioEffect
-          );
-        });
-        this.audioElement?.play();
-      } else {
-        if (!this.seriousWarning) {
-          this.stopPlayAudioEffect();
-        }
-      }
-    },
-
-    stopPlayAudioEffect() {
-      this.seriousWarning = false;
-      if (this.audioElement) {
-        this.audioElement.pause();
-        this.audioElement.currentTime = 0;
-        this.audioElement.loop = false;
-      }
-      this.audioElement = null;
-    },
-    //获取报警配置
-    getAlarmConfig() {
-      if (localStorage.getItem("alarmConfigArray")) {
-        this.alarmConfigArray = JSON.parse(
-          localStorage.getItem("alarmConfigArray")
-        );
-      } else {
-        this.alarmConfigArray = [
-          {
-            id: "1",
-            alarmLevel: 1,
-            isAlart: false,
-            isAlarmSound: false,
-            isContinuousAlarm: false,
-          },
-          {
-            id: "2",
-            alarmLevel: 2,
-            isAlart: false,
-            isAlarmSound: false,
-            isContinuousAlarm: false,
-          },
-          {
-            id: "3",
-            alarmLevel: 3,
-            isAlart: true,
-            isAlarmSound: false,
-            isContinuousAlarm: false,
-          },
-          {
-            id: "4",
-            alarmLevel: 4,
-            isAlart: true,
-            isAlarmSound: true,
-            isContinuousAlarm: false,
-          },
-          {
-            id: "5",
-            alarmLevel: 5,
-            isAlart: true,
-            isAlarmSound: true,
-            isContinuousAlarm: true,
-          },
-        ];
-        localStorage.setItem(
-          "alarmConfigArray",
-          JSON.stringify(this.alarmConfigArray)
-        );
-      }
-    },
-    getAlarmName(alarmItem) {
-      let alarmName = "";
-      if (alarmItem.deviceType === "booststation") {
-        alarmName = "升压站报警";
-      } else if (alarmItem.deviceType === "inverter") {
-        alarmName = "光伏报警";
-      } else if (alarmItem.deviceType === "windturbine") {
-        alarmName = "设备报警";
-      } else if (alarmItem.deviceType === "station") {
-        alarmName = "场站";
-      }
-
-      if (alarmItem.alarmType === "custom") {
-        alarmName = "自定义报警";
-      }
-      return alarmName;
-    },
-
-    getLvName(alarmItem) {
-      if (alarmItem.rank === 1) {
-        return "低级";
-      } else if (alarmItem.rank === 2) {
-        return "低中级";
-      } else if (alarmItem.rank === 3) {
-        return "中级";
-      } else if (alarmItem.rank === 4) {
-        return "中高级";
-      } else if (alarmItem.rank === 5) {
-        return "高级";
-      }
-    },
-    //查历史报警
-    getAlarmHistory(alarmType, deviceType) {
-      let params = {
-        pageNum: 1,
-        pageSize: 5000,
-        alarmId: "",
-        alarmType,
-        stationid: "",
-        deviceid: "",
-        modelId: "",
-        components: "",
-        description: "",
-        isclose: false,
-        begin: "",
-        end: "",
-      };
-      if (params.alarmType == "windturbine") {
-        params.stationid = "SXJ_KGDL_DJY_FDC_STA";
-      } else if (params.alarmType == "inverter") {
-        params.stationid = "SXJ_KGDL_JR_GDC_STA";
-      }
-      return GetDeviceTableData(params, 12000);
-    },
-    pushALarmItem(alarmItem, type) {
-      const configItem = this.getConfigItem(alarmItem.rank);
-      const alarmOption = {
-        id: alarmItem.id ? alarmItem.id : alarmItem.tbname,
-        lv: alarmItem.rank,
-        lvName: this.getLvName(alarmItem),
-        rank: alarmItem.rank,
-        class: `animate__bounceInRight lv${alarmItem.rank}`,
-        deviceId: alarmItem.deviceId,
-        faultCause: alarmItem.faultCause,
-        resolvent: alarmItem.resolvent,
-        characteristic: alarmItem.characteristic,
-        code: alarmItem.code,
-        wpName: alarmItem.stationName
-          ? alarmItem.stationName
-          : alarmItem.wpName,
-        isClose: alarmItem.isClose
-          ? alarmItem.isClose
-          : alarmItem.closeTime
-          ? true
-          : false,
-        isCloseName:
-          alarmItem.closeTime || alarmItem.isClose ? "已解除" : "未解除",
-        alarmId: alarmItem.alarmId,
-        alarmType: alarmItem.alarmType,
-        alarmName: this.getAlarmName(alarmItem),
-        description: alarmItem.description,
-        deviceType: alarmItem.deviceType,
-        oval: alarmItem.oval,
-        triggerType: alarmItem.triggerType,
-        ts: alarmItem.ts
-          ? dayjs(alarmItem.ts).valueOf()
-          : dayjs(alarmItem.lastUpdateTime).valueOf(),
-        deviceName: alarmItem.deviceName,
-        tsName: alarmItem.ts
-          ? new Date(alarmItem.ts).formatDate("MM-dd hh:mm:ss")
-          : new Date(alarmItem.lastUpdateTime).formatDate("MM-dd hh:mm:ss"),
-        fullTsName: alarmItem.ts
-          ? new Date(alarmItem.ts).formatDate("yyyy-MM-dd hh:mm:ss")
-          : new Date(alarmItem.lastUpdateTime).formatDate(
-              "yyyy-MM-dd hh:mm:ss"
-            ),
-      };
-      if (alarmItem.alarmType == "booststation") {
-        if (
-          configItem.isAlarmSound ||
-          configItem.isAlart ||
-          configItem.isContinuousAlarm
-        ) {
-          let a = {};
-          a[`${alarmItem.stationId}`] = alarmItem.closeTime ? false : true;
-          this.alarmList.push(a);
-          this.alarmList = [
-            ...new Set(this.alarmList.map((t) => JSON.stringify(t))),
-          ].map((s) => JSON.parse(s));
-        }
-      }
-      if (
-        configItem.isAlarmSound ||
-        configItem.isAlart ||
-        configItem.isContinuousAlarm
-      ) {
-        if (type && type == "ws") {
-          this.dialogList.unshift(alarmOption);
-        } else {
-          this.dialogList.push(alarmOption);
-        }
-      }
-      this.playAudioEffect();
-    },
-    getConfigItem(lv) {
-      return (
-        this.alarmConfigArray.find((ele) => {
-          return ele.alarmLevel === lv;
-        }) || {}
-      );
-    },
-
-    // 拖拽相关
-    startDrag(event) {
-      this.currentX = event.clientX;
-      this.currentY = event.clientY;
-    },
-    stopDrag(event) {
-      let x = event.clientX - this.currentX;
-      let y = event.clientY - this.currentY;
-      this.x += x;
-      if (this.x < 60) {
-        this.x = 60;
-      } else if (this.x > window.innerWidth - 20) {
-        this.x = window.innerWidth - 82;
-      }
-      this.y += y;
-      if (this.y > window.innerHeight - 20) {
-        this.y = window.innerHeight - 82;
-      } else if (this.y < 0) {
-        this.y = 0;
-      }
-    },
-    //开关列表
-    displayAlarm(val) {
-      this.displayAlarms = !this.displayAlarms;
-      if (this.displayAlarms == true) {
-        setTimeout(() => {
-          this.$refs.deligoChild &&
-            this.$refs.deligoChild.init(this.dialogList);
-        }, 0);
-      }
-    },
-    displayClose() {
-      this.displayAlarms = false;
-    },
     getScale() {
       const w = window.innerWidth / this.style.width;
       const h = window.innerHeight / this.style.height;
@@ -634,214 +200,13 @@ export default {
     },
     login() {
       this.$store.commit("user/SET_LOGINSTATE", true);
-      this.getBooster();
-      this.getCftlist();
+
       // websocket启动
       //   this.createWebSocket();
     },
     selectMenu(menuIndex) {
       this.menuIndex = menuIndex;
     },
-    // // websocket启动
-    // createWebSocket() {
-    //   //   let webSocketLink = `ws://192.168.1.102:6014/websocketBt/${this.$store.state.user.userId}_${this.$store.state.user.authToken}`;
-    //   let webSocketLink = `ws://10.81.3.154:6014/websocketBt/${this.$store.state.user.userId}_${this.$store.state.user.authToken}`; // webSocket地址
-    //   try {
-    //     if ("WebSocket" in window) {
-    //       this.socketObj = new WebSocket(webSocketLink);
-    //     }
-    //     // websocket事件绑定
-    //     this.socketEventBind();
-    //   } catch (e) {
-    //     console.log("catch" + e);
-    //     // websocket重连
-    //     this.socketReconnect();
-    //   }
-    // },
-    // // websocket事件绑定
-    // socketEventBind() {
-    //   // 连接成功建立的回调
-    //   this.socketObj.onopen = this.onopenCallback;
-    //   // 连接发生错误的回调
-    //   this.socketObj.onerror = this.onerrorCallback;
-    //   // 连接关闭的回调
-    //   this.socketObj.onclose = this.oncloseCallback;
-    //   // 向后端发送数据的回调
-    //   this.socketObj.onsend = this.onsendCallback;
-    //   // 接收到消息的回调
-    //   this.socketObj.onmessage = this.getMessageCallback;
-
-    //   //监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。
-    //   window.onbeforeunload = () => {
-    //     this.socketObj.close();
-    //   };
-    // },
-    // // websocket重连
-    // socketReconnect() {
-    //   if (this.socketReconnectLock) {
-    //     return;
-    //   }
-    //   this.socketReconnectLock = true;
-    //   this.socketReconnectTimer && clearTimeout(this.socketReconnectTimer);
-    //   this.socketReconnectTimer = setTimeout(() => {
-    //     // console.log("WebSocket:重连中...");
-    //     this.socketReconnectLock = false;
-    //     // websocket启动
-    //     this.createWebSocket();
-    //   }, 4000);
-    // },
-    // // 连接成功建立的回调
-    // onopenCallback: function (event) {
-    //   //   console.log("WebSocket:已连接");
-    //   // 心跳检测重置
-    //   this.heartCheck.reset().start();
-    // },
-    // // 连接发生错误的回调
-    // onerrorCallback: function (event) {
-    //   //   console.log("WebSocket:发生错误");
-    //   // websocket重连
-    //   this.socketReconnect();
-    // },
-    // // 连接关闭的回调
-    // oncloseCallback: function (event) {
-    //   //   console.log("WebSocket:已关闭");
-    //   // 心跳检测重置
-    //   this.heartCheck.reset();
-    //   if (!this.socketLeaveFlag) {
-    //     // 没有离开——重连
-    //     // websocket重连
-    //     this.socketReconnect();
-    //   }
-    // },
-    // // 向后端发送数据的回调
-    // onsendCallback: function () {
-    //   //   console.log("WebSocket:发送信息给后端");
-    // },
-    // // 接收到消息的回调
-    // getMessageCallback: function (msg) {
-    //   //   console.log(msg);
-    //   if (Object.keys(msg) && msg.data == "ok") {
-    //     // 心跳回复——心跳检测重置
-    //     // 收到心跳检测回复就说明连接正常
-    //     console.log("收到心跳检测回复");
-    //     // 心跳检测重置
-    //     this.heartCheck.reset().start();
-    //   } else {
-    //     // 普通推送——正常处理
-    //     // console.log("收到推送消息");
-    //     let data = JSON.parse(msg.data);
-    //     // 相关处理
-    //     // console.log(data);
-    //     if (data) {
-    //       this.alarmList.push(data);
-    //       this.alarmList = [
-    //         ...new Set(this.alarmList.map((t) => JSON.stringify(t))),
-    //       ].map((s) => JSON.parse(s));
-    //       this.$store.commit("changeAlarmlist", this.alarmList);
-    //     }
-    //     // localStorage.setItem("alarmList", JSON.stringify(this.alarmList));
-    //   }
-    // },
-    // websocket启动
-    createWebSocket1() {
-      //   let webSocketLink = `ws://192.168.1.102:6014/websocket/${this.$store.state.user.userId}_${this.$store.state.user.authToken}`;
-      let webSocketLink1 = `ws://10.81.3.154:6014/websocket/${this.$store.state.user.userId}_${this.$store.state.user.authToken}`; // webSocket地址
-      try {
-        if ("WebSocket" in window) {
-          this.socketObj1 = new WebSocket(webSocketLink1);
-        }
-        // websocket事件绑定
-        this.socketEventBind1();
-      } catch (e) {
-        console.log("catch" + e);
-        // websocket重连
-        this.socketReconnect1();
-      }
-    },
-    // websocket事件绑定
-    socketEventBind1() {
-      // 连接成功建立的回调
-      this.socketObj1.onopen = this.onopenCallback1;
-      // 连接发生错误的回调
-      this.socketObj1.onerror = this.onerrorCallback1;
-      // 连接关闭的回调
-      this.socketObj1.onclose = this.oncloseCallback1;
-      // 向后端发送数据的回调
-      this.socketObj1.onsend = this.onsendCallback1;
-      // 接收到消息的回调
-      this.socketObj1.onmessage = this.getMessageCallback1;
-
-      //监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。
-      window.onbeforeunload = () => {
-        this.socketObj1.close();
-      };
-    },
-    // websocket重连
-    socketReconnect1() {
-      if (this.socketReconnectLock1) {
-        return;
-      }
-      this.socketReconnectLock1 = true;
-      this.socketReconnectTimer1 && clearTimeout(this.socketReconnectTimer1);
-      this.socketReconnectTimer1 = setTimeout(() => {
-        console.log("WebSocket1:重连中...");
-        this.socketReconnectLock1 = false;
-        // websocket启动
-        this.createWebSocket1();
-      }, 4000);
-    },
-    // 连接成功建立的回调
-    onopenCallback1: function (event) {
-      console.log("WebSocket1:已连接");
-      // 心跳检测重置
-      this.heartCheck1.reset().start();
-    },
-    // 连接发生错误的回调
-    onerrorCallback1: function (event) {
-      console.log("WebSocket1:发生错误");
-      // websocket重连
-      this.socketReconnect1();
-    },
-    // 连接关闭的回调
-    oncloseCallback1: function (event) {
-      console.log("WebSocket1:已关闭");
-      // 心跳检测重置
-      this.heartCheck1.reset();
-      if (!this.socketLeaveFlag1) {
-        // 没有离开——重连
-        // websocket重连
-        this.socketReconnect1();
-      }
-    },
-    // 向后端发送数据的回调
-    onsendCallback1: function () {
-      console.log("WebSocket1:发送信息给后端");
-    },
-    // 接收到消息的回调
-    getMessageCallback1: function (msg) {
-      //   console.log(msg);
-      if (Object.keys(msg) && msg.data == "ok") {
-        // 心跳回复——心跳检测重置
-        // 收到心跳检测回复就说明连接正常
-        console.log("收到心跳检测回复1");
-        // 心跳检测重置
-        this.heartCheck1.reset().start();
-      } else {
-        // 普通推送——正常处理
-        console.log("收到推送消息1");
-
-        let data = JSON.parse(msg.data);
-        // 相关处理
-        if (data) {
-          this.pushALarmItem(data, "ws");
-          //   this.dialogList.sort((a, b) => {
-          //     return b.lv - a.lv;
-          //   });
-          this.$store.commit("changeAlarmlist", this.alarmList);
-          this.$store.commit("setWarning", this.dialogList);
-        }
-      }
-    },
   },
 
   watch: {
@@ -856,6 +221,10 @@ export default {
           // 关闭WebSocket
           this.socketObj.close();
         }
+        if (res) {
+          this.getBooster();
+          this.getCftlist();
+        }
       },
       immediate: true,
     },

src/api/monthlyPerformanceAnalysis.js

@@ -308,6 +308,7 @@ export function getApiequipmentinfoDayList(params) {
     method: "GET",
   });
 }
+
 export function getApiequipmentinfoDayHistoryList(params) {
   return request({
     baseURL: process.env.VUE_APP_API,
@@ -348,7 +349,7 @@ export function getApimaincenterlist(params) {
     method: "GET",
   });
 }
-//查询全域当年电量
+//查询电量分析
 export function getMonthElectricAnalyse(params) {
   return request({
     baseURL: process.env.VUE_APP_API,
@@ -356,3 +357,11 @@ export function getMonthElectricAnalyse(params) {
     method: "GET",
   });
 }
+//查询逆变器电量分析
+export function getMonthElectricAnalyseGf(params) {
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/electricity/coulometric?wpId=${params.wpId}`,
+    method: "GET",
+  });
+}

src/api/powerAnalyse.js

@@ -85,3 +85,11 @@ export function getPowerHotChartGF({
     // timeout: 9000,
   });
 }
+//光伏性能评价
+export function getApiequipmentinfoDayListGf(params) {
+  return request({
+    baseURL: process.env.VUE_APP_TEST,
+    url: `photovoltaic/analysis?stationId=${params.stationId}&time=${params.time}&timeType=${params.timeType}&pageSize=${params.pageSize}&pageNum=${params.pageNum}`,
+    method: "GET",
+  });
+}

src/components/alarm-badge/alarm-setting.vue

@@ -0,0 +1,242 @@
+<template>
+  <div class="setting-dialog">
+    <div class="setting-wrapper">
+      <div class="box-title">
+        <div class="box-name">报警配置</div>
+        <div class="box-close" @click="cancle">
+          <img src="@assets/imgs/warn-close.png" />
+        </div>
+      </div>
+      <div class="box-content">
+        <el-tabs type="border-card" v-model="activeTab">
+          <el-tab-pane
+            v-for="(item, index) in configArray"
+            :key="index"
+            :name="item.id"
+          >
+            <template #label>
+              <div class="alartPaneLabel">
+                <span>{{ getAlartLevelName(item.alarmLevel) }}</span>
+                <div class="alartBadge" :class="getAlartStatus(item)"></div>
+              </div>
+            </template>
+            <el-form label-width="120px">
+              <el-form-item label="报警弹窗:">
+                <el-switch
+                  v-model="item.isAlart"
+                  active-text="弹出"
+                  inactive-text="不弹出"
+                />
+              </el-form-item>
+              <el-form-item label="播放声音:">
+                <el-switch
+                  v-model="item.isAlarmSound"
+                  active-text="播放"
+                  inactive-text="不播放"
+                />
+              </el-form-item>
+              <el-form-item label="必须确认:">
+                <el-switch
+                  v-model="item.isContinuousAlarm"
+                  active-text="是"
+                  inactive-text="否"
+                />
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+        </el-tabs>
+        <div class="btnBox">
+          <el-button @click="save">保存配置</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { confirmAlart } from "@/api/zhbj/index.js";
+import SvgIcon from "@com/coms/icon/svg-icon.vue";
+import dayjs from "dayjs";
+
+export default {
+  name: "alarmSetting", //首页标题栏
+  props: {
+    alarmConfigArray: {
+      type: Array,
+      required: true,
+    },
+    dialogList: {
+      type: Array,
+    },
+  },
+  components: { SvgIcon },
+  data() {
+    return {
+      displaySetting: false,
+      activeTab: "",
+      configArray: [],
+    };
+  },
+
+  created() {
+    this.activeTab = this.activeTab || this.alarmConfigArray?.[0]?.id;
+  },
+  mounted() {},
+  computed: {},
+  watch: {
+    alarmConfigArray: {
+      handler(val) {
+        if (val.length) {
+          this.configArray = JSON.parse(JSON.stringify(val));
+        }
+      },
+      immediate: true,
+      deep: true,
+    },
+  },
+  methods: {
+    cancle() {
+      this.configArray = this.alarmConfigArray;
+      this.$emit("cancleConfig");
+    },
+    save() {
+      localStorage.setItem(
+        "alarmConfigArray",
+        JSON.stringify(this.configArray)
+      );
+      this.$emit("saveConfig");
+      this.BASE.showMsg({
+        type: "success",
+        msg: "修改成功",
+      });
+      this.$emit("cancleConfig");
+    },
+    getAlartStatus(alartItem) {
+      if (
+        alartItem.isAlart ||
+        alartItem.isAlarmSound ||
+        alartItem.isContinuousAlarm
+      ) {
+        return "badgeWork";
+      } else {
+        return "badgeNotworK";
+      }
+    },
+
+    getAlartLevelName(lv) {
+      if (lv === 1) {
+        return "低级";
+      } else if (lv === 2) {
+        return "低中级";
+      } else if (lv === 3) {
+        return "中级";
+      } else if (lv === 4) {
+        return "中高级";
+      } else if (lv === 5) {
+        return "高级";
+      }
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.setting-dialog {
+  position: absolute;
+  right: -12px;
+  bottom: -6px;
+  z-index: 1001;
+  width: 540px;
+  height: 510px;
+  .setting-wrapper {
+    width: 100%;
+    height: 100%;
+    border-radius: 6px;
+    background: #000;
+    background: url("~@/assets/imgs/warn-border.png") no-repeat;
+    background-size: 100% 100%;
+    .box-title {
+      width: 100%;
+      height: 60px;
+      padding: 0 22px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      background: url("~@/assets/imgs/warn-top.png") no-repeat;
+      background-size: 100% 100%;
+      .warn-close {
+        cursor: pointer;
+      }
+    }
+    .box-content {
+      height: calc(100% - 60px);
+      padding: 0 10px;
+      .btnBox {
+        .el-button ::v-deep {
+          width: 100px;
+          background: url("~@/assets/imgs/confirmone.png") no-repeat;
+          background-size: 100% 100%;
+          height: 37px;
+          border-radius: 5px;
+          border-width: 0;
+          color: #b6afaf;
+          font-size: 16px;
+          margin-top: 10px;
+          opacity: 0.8;
+          &:hover,
+          &:focus {
+            color: #fff;
+            opacity: 1;
+            background-color: transparent;
+            border-width: 0;
+          }
+          &.cancle {
+            background: #ccc;
+            color: #3a3838;
+            &:hover,
+            &:focus {
+              color: #000;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+.el-tabs ::v-deep {
+  height: calc(100% - 80px);
+  &.el-tabs--border-card {
+    background: transparent !important;
+    border-color: transparent !important;
+  }
+  &.el-tabs--border-card > .el-tabs__header {
+    background: transparent !important;
+    border-color: transparent !important;
+  }
+
+  &.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active,
+  &.el-tabs--border-card > .el-tabs__header .el-tabs__item:hover {
+    color: #fd7f00 !important;
+    background: transparent !important;
+    border-right-color: transparent !important;
+    border-left-color: transparent !important;
+  }
+}
+.el-form::v-deep {
+  .el-form-item__label {
+    color: #ccc;
+  }
+}
+.el-switch::v-deep {
+  &.is-checked .el-switch__core {
+    border-color: #fd7f00;
+    background-color: #fd7f00;
+  }
+  .el-switch__label {
+    color: #ccc;
+    &.is-active {
+      color: #fd7f00;
+    }
+  }
+}
+</style>

src/components/alarm-badge/index.vue

@@ -14,25 +14,31 @@
         <img src="@assets/imgs/ygj.png" class="trans" />
         <img src="@assets/imgs/ygj1.png" />
       </div>
-      <div class="alarmDeligo" v-if="!warnLength">
+      <div class="alarmDeligo" @dblclick="setting" v-if="!warnLength">
         <img src="@assets/imgs/wgj.png" class="trans" />
         <img src="@assets/imgs/wgj1.png" />
       </div>
     </el-badge>
     <deligo-alarm-list
-      :dialogList="dialogList.slice(0, 12)"
-      :alarmConfigArray="alarmConfigArray"
-      @setConfig="getAlarmConfig"
-      @confirm="playAudioEffect"
+      :dialogList="warnList.slice(0, 12)"
+      @setConfig="displaySetting = true"
+      @confirmed="handleConfirm"
       ref="deligoChild"
       @close="displayClose"
       v-if="displayAlarms == true"
     ></deligo-alarm-list>
+    <alarmSetting
+      v-if="displaySetting"
+      @saveConfig="getAlarmConfig"
+      @cancleConfig="displaySetting = false"
+      :alarmConfigArray="alarmConfigArray"
+    />
   </div>
 </template>
 
 <script>
 import deligoAlarmList from "@/components/deligoAlarmList";
+import alarmSetting from "@/components/alarm-badge/alarm-setting.vue";
 import { ElNotification } from "element-plus";
 import { GetDeviceTableData } from "@/api/zhbj/index.js";
 import dayjs from "dayjs";
@@ -40,6 +46,7 @@ export default {
   name: "alarmBadge",
   components: {
     deligoAlarmList,
+    alarmSetting,
   },
 
   data() {
@@ -112,6 +119,7 @@ export default {
         },
       ],
       alarmConfigArray: [],
+      displaySetting: false,
       seriousWarning: false,
       audioElement: null,
     };
@@ -120,6 +128,9 @@ export default {
     warnLength() {
       return this.$store.state.warnList.length;
     },
+    warnList() {
+      return this.$store.state.warnList;
+    },
     isLogined() {
       return this.$store.state.user?.loginState;
     },
@@ -129,8 +140,8 @@ export default {
     this.x = window.innerWidth - 82;
     this.y = window.innerHeight - 32;
     let requestResult = [];
-    this.requestAlarmHistoryParams.forEach(({ alarmType, deviceType }) => {
-      requestResult.push(this.getAlarmHistory(alarmType, deviceType));
+    this.requestAlarmHistoryParams.forEach(({ alarmType }) => {
+      requestResult.push(this.getAlarmHistory(alarmType));
     });
 
     Promise.all(requestResult)
@@ -180,6 +191,20 @@ export default {
     console.log("离开标记", this.socketLeaveFlag);
   },
   methods: {
+    setting() {
+      this.displaySetting = true;
+    },
+
+    handleConfirm(flag) {
+      this.playAudioEffect();
+      if (flag) {
+        this.dialogList = [];
+        this.$store.commit("setWarning", this.dialogList);
+        setTimeout(() => {
+          this.$refs.deligoChild && this.$refs.deligoChild.init(this.warnList);
+        }, 0);
+      }
+    },
     playAudioEffect() {
       const lv1Config = this.getConfigItem(1);
       let lv1Play = false;
@@ -338,7 +363,7 @@ export default {
       }
     },
     //查历史报警
-    getAlarmHistory(alarmType, deviceType) {
+    getAlarmHistory(alarmType) {
       let params = {
         pageNum: 1,
         pageSize: 5000,
@@ -376,13 +401,13 @@ export default {
         wpName: alarmItem.stationName
           ? alarmItem.stationName
           : alarmItem.wpName,
-        isClose: alarmItem.isClose
-          ? alarmItem.isClose
-          : alarmItem.closeTime
-          ? true
-          : false,
-        isCloseName:
-          alarmItem.closeTime || alarmItem.isClose ? "已解除" : "未解除",
+        stationId: alarmItem.stationId ? alarmItem.stationId : alarmItem.wpId,
+        isClose: alarmItem.closeTime ? true : alarmItem.endts ? true : false,
+        isCloseName: alarmItem.closeTime
+          ? "已解除"
+          : alarmItem.endts
+          ? "已解除"
+          : "未解除",
         alarmId: alarmItem.alarmId,
         alarmType: alarmItem.alarmType,
         alarmName: this.getAlarmName(alarmItem),
@@ -392,18 +417,27 @@ export default {
         triggerType: alarmItem.triggerType,
         ts: alarmItem.ts
           ? dayjs(alarmItem.ts).valueOf()
-          : dayjs(alarmItem.lastUpdateTime).valueOf(),
-        deviceName: alarmItem.deviceName,
+          : dayjs(alarmItem.updateTime).valueOf(),
+        endts: alarmItem.endts
+          ? dayjs(alarmItem.endts).format("YYYY-MM-DD HH:mm:ss")
+          : null,
+        closeTime: alarmItem.closeTime
+          ? dayjs(alarmItem.closeTime).format("YYYY-MM-DD HH:mm:ss")
+          : null,
+        deviceName: alarmItem.deviceName
+          ? alarmItem.deviceName
+          : alarmItem.code,
         tsName: alarmItem.ts
           ? new Date(alarmItem.ts).formatDate("MM-dd hh:mm:ss")
-          : new Date(alarmItem.lastUpdateTime).formatDate("MM-dd hh:mm:ss"),
+          : new Date(alarmItem.updateTime).formatDate("MM-dd hh:mm:ss"),
         fullTsName: alarmItem.ts
           ? new Date(alarmItem.ts).formatDate("yyyy-MM-dd hh:mm:ss")
-          : new Date(alarmItem.lastUpdateTime).formatDate(
-              "yyyy-MM-dd hh:mm:ss"
-            ),
+          : new Date(alarmItem.updateTime).formatDate("yyyy-MM-dd hh:mm:ss"),
       };
-      if (alarmItem.alarmType == "booststation") {
+      if (
+        alarmItem.alarmType == "booststation" &&
+        alarmItem.deviceType != "custom"
+      ) {
         if (
           configItem.isAlarmSound ||
           configItem.isAlart ||
@@ -418,9 +452,10 @@ export default {
         }
       }
       if (
-        configItem.isAlarmSound ||
-        configItem.isAlart ||
-        configItem.isContinuousAlarm
+        (configItem.isAlarmSound ||
+          configItem.isAlart ||
+          configItem.isContinuousAlarm) &&
+        alarmItem.deviceType != "custom"
       ) {
         if (type && type == "ws") {
           this.dialogList.unshift(alarmOption);
@@ -464,8 +499,7 @@ export default {
       this.displayAlarms = !this.displayAlarms;
       if (this.displayAlarms == true) {
         setTimeout(() => {
-          this.$refs.deligoChild &&
-            this.$refs.deligoChild.init(this.dialogList);
+          this.$refs.deligoChild && this.$refs.deligoChild.init(this.warnList);
         }, 0);
       }
     },
@@ -559,11 +593,11 @@ export default {
         this.heartCheck1.reset().start();
       } else {
         // 普通推送——正常处理
-        console.log("收到推送消息1");
 
         let data = JSON.parse(msg.data);
         // 相关处理
         if (data) {
+          console.log("收到推送消息1", data);
           this.pushALarmItem(data, "ws");
           //   this.dialogList.sort((a, b) => {
           //     return b.lv - a.lv;

src/components/chart/bar/list-bar-chart2-home.vue

@@ -29,28 +29,7 @@ export default {
     //  传入数据
     list: {
       type: Array,
-      default: () => [
-        {
-          name: "当日预测电量",
-          value: 103.62,
-          total: 200,
-        },
-        {
-          name: "实际发电量",
-          value: 98.62,
-          total: 100,
-        },
-        {
-          name: "当月预测电量",
-          value: 113.27,
-          total: 100,
-        },
-        {
-          name: "实际发电量",
-          value: 136.72,
-          total: 100,
-        },
-      ],
+      default: () => [],
     },
     total: {
       type: Number,
@@ -68,9 +47,7 @@ export default {
       firstAnimation: true,
     };
   },
-  created() {
-   
-  },
+
   computed: {
     datas() {
       return this.list.map((t) => {
@@ -81,7 +58,8 @@ export default {
   methods: {
     resize() {},
     initChart(value, index) {
-      var currColor = this.colors[ (value.color?value.color % 2 : index % 2) ];
+      console.log(value, index);
+      var currColor = this.colors[value.color ? value.color % 2 : index % 2];
       var $dom = document.getElementById(this.id + (index + 1));
       $dom.style.width = this.width;
       $dom.style.height = `calc(${this.height} / ${this.list.length} - 4px)`;
@@ -167,7 +145,7 @@ export default {
                 },
                 textStyle: {
                   color: partten.getColor(currColor),
-                    // this.$store.state.themeName === "dark" ? "#ffffff" : "#000",
+                  // this.$store.state.themeName === "dark" ? "#ffffff" : "#000",
                   fontSize: 12,
                 },
               },
@@ -300,39 +278,55 @@ export default {
       window.removeEventListener("resize", this.resize);
       window.addEventListener("resize", this.resize);
     },
-    handleElectricDetail(){}
+    handleElectricDetail() {},
   },
   created() {
     this.id = "pie-chart-" + util.newGUID();
   },
   mounted() {
-    this.$nextTick(() => {
-      this.$el.style.width = this.width;
-      this.$el.style.height = this.height;
-      this.list.forEach((value, index) => {
-        this.initChart(value, index);
-      });
-      this.firstAnimation = false;
-    });
+    // this.$nextTick(() => {
+    //   this.$el.style.width = this.width;
+    //   this.$el.style.height = this.height;
+    //   this.list.forEach((value, index) => {
+    //     this.initChart(value, index);
+    //   });
+    //   this.firstAnimation = false;
+    // });
   },
-  updated() {
-    this.$nextTick(() => {
-      this.list.forEach((value, index) => {
-        this.initChart(value, index);
-      });
-    });
-  },
-  unmounted() {
-    window.removeEventListener("resize", this.resize);
-  },
-
+  //   updated() {
+  //     this.$nextTick(() => {
+  //       this.list.forEach((value, index) => {
+  //         this.initChart(value, index);
+  //       });
+  //     });
+  //   },
   watch: {
+    list: {
+      handler(val) {
+        if (val && val.length) {
+          this.$nextTick(() => {
+            console.log(val, 1);
+            this.$el.style.width = this.width;
+            this.$el.style.height = this.height;
+            this.list.forEach((value, index) => {
+              this.initChart(value, index);
+            });
+            this.firstAnimation = false;
+          });
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
     "$store.state.themeName"() {
       this.list.forEach((value, index) => {
         this.initChart(value, index);
       });
     },
   },
+  unmounted() {
+    window.removeEventListener("resize", this.resize);
+  },
 };
 </script>
 

src/components/deligoAlarmList/index.vue

@@ -36,10 +36,10 @@
               :width="header.width"
             >
               <template #default="{ row }">
-                <div v-if="header.code == ''">
-                  {{ row["wpName"] }}{{ row["deviceName"] }}设备{{
-                    row["description"]
-                  }}
+                <div v-if="header.code == ''" @dblclick="handleTo(row)">
+                  {{ row["wpName"] }}{{ row["deviceName"]
+                  }}{{ row.alarmType != "booststation" ? "设备" : ""
+                  }}{{ row["description"] }}
                 </div>
                 <div
                   v-else-if="header.code == 'isCloseName'"
@@ -58,17 +58,15 @@
           <div class="setting svg-icon" @click="setAlarmConfig">
             <SvgIcon svgid="svg-setting" />
           </div>
-          <el-button class="confirm-one" @click="confirm" :disabled="checkAll"
-            >选择确认
-          </el-button>
-          <el-button class="confirm-all" @click="confirm" :disabled="!checkAll"
+          <el-button class="confirm-one" @click="confirm">选择确认 </el-button>
+          <el-button class="confirm-all" @click="confirmAll"
             >全部确认
           </el-button>
         </div>
       </div>
     </div>
   </div>
-  <div class="setting-dialog" v-if="displaySetting">
+  <!-- <div class="setting-dialog" v-if="displaySetting">
     <div class="setting-wrapper">
       <div class="box-title">
         <div class="box-name">报警配置</div>
@@ -119,13 +117,13 @@
         </div>
       </div>
     </div>
-  </div>
+  </div> -->
 </template>
 
 <script>
 import { confirmAlart } from "@/api/zhbj/index.js";
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
-import { nextTick } from "vue";
+import dayjs from "dayjs";
 
 export default {
   name: "byPase", //首页标题栏
@@ -141,22 +139,17 @@ export default {
   components: { SvgIcon },
   data() {
     return {
-      displaySetting: false,
       tableHeader: [
         { title: "时间", code: "tsName", width: "120" },
         { title: "描述", code: "", width: "" },
         { title: "是否解除", code: "isCloseName", width: "80" },
       ],
       checkedRow: [],
-      checkAll: false,
-      activeTab: "",
-      configArray: [],
       warnList: [],
     };
   },
 
   created() {
-    this.activeTab = this.activeTab || this.alarmConfigArray?.[0]?.id;
     this.warnList = this.dialogList;
   },
   mounted() {},
@@ -164,22 +157,43 @@ export default {
     warnNum() {
       return this.$store.state.warnList.length;
     },
-    // warnList() {
-    //   return this.$store.state.warnList;
-    // },
-  },
-  watch: {
-    alarmConfigArray: {
-      handler(val) {
-        if (val.length) {
-          this.configArray = val;
-        }
-      },
-      immediate: true,
-      deep: true,
+    list() {
+      return this.$store.state.warnList;
     },
   },
+
   methods: {
+    handleTo(row) {
+      console.log(row);
+      if (row.alarmType == "booststation") {
+        this.$router.push({
+          path: "/stateMonitor/alarmCenter",
+          query: {
+            id: row.id,
+            stationId: row.stationId,
+            alarmType: row.alarmType,
+            ts: row.ts,
+            endts: row.isClose
+              ? dayjs(row.endts).valueOf() || dayjs(row.closeTime).valueOf()
+              : "",
+          },
+        });
+      } else {
+        this.$router.push({
+          path: "/stateMonitor/alarmCenter",
+          query: {
+            id: row.id,
+            stationId: row.stationId,
+            deviceId: row.deviceId,
+            alarmType: row.alarmType,
+            ts: row.ts,
+            endts: row.isClose
+              ? dayjs(row.endts).valueOf() || dayjs(row.closeTime).valueOf()
+              : "",
+          },
+        });
+      }
+    },
     init(list) {
       this.warnList = list;
     },
@@ -194,25 +208,9 @@ export default {
       this.configArray = this.alarmConfigArray;
       this.displaySetting = false;
     },
-    save() {
-      localStorage.setItem(
-        "alarmConfigArray",
-        JSON.stringify(this.configArray)
-      );
-      this.$emit("setConfig");
-      this.BASE.showMsg({
-        type: "success",
-        msg: "修改成功",
-      });
-      this.displaySetting = false;
-    },
+
     handleSelectionChange(rows) {
       this.checkedRow = rows;
-      if (this.checkedRow.length == this.warnNum) {
-        this.checkAll = true;
-      } else {
-        this.checkAll = false;
-      }
     },
     displayAlarm() {
       this.$emit("close");
@@ -223,55 +221,62 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        let arr = this.checkedRow.map((item) => {
+        let arr = [];
+
+        arr = this.checkedRow.map((item) => {
           return { alarmType: item.alarmType, id: item.id };
         });
-        setTimeout(() => {
-          confirmAlart(arr).then((res) => {
-            if (res.code === 200) {
-              this.BASE.showMsg({
-                type: "success",
-                msg: "确认成功",
-              });
-              if (this.checkAll) {
-                this.$store.commit("emptyWarning");
-                this.$emit("confirm");
-              } else {
-                this.$store.commit("removeWarning", this.checkedRow);
-                this.$emit("confirm");
+
+        confirmAlart(arr).then((res) => {
+          if (res.code === 200) {
+            this.BASE.showMsg({
+              type: "success",
+              msg: "确认成功",
+            });
+            this.checkedRow.forEach((ele) => {
+              for (let i = 0; i < this.warnList.length; i++) {
+                if (
+                  `${ele.id}${ele.ts}` ===
+                  `${this.warnList[i].id}${this.warnList[i].ts}`
+                ) {
+                  setTimeout(() => {
+                    this.warnList.splice(i, 1);
+                  }, 0);
+                  break;
+                }
               }
-            }
-          });
-        }, 500);
+            });
+            this.$store.commit("setWarning", this.warnList);
+            this.$emit("confirmed");
+          }
+        });
       });
     },
-    setAlarmConfig() {
-      this.displaySetting = true;
-    },
-    getAlartStatus(alartItem) {
-      if (
-        alartItem.isAlart ||
-        alartItem.isAlarmSound ||
-        alartItem.isContinuousAlarm
-      ) {
-        return "badgeWork";
-      } else {
-        return "badgeNotworK";
-      }
+    confirmAll() {
+      this.$confirm("您确定要执行此操作吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let arr = [];
+        let oldList = this.warnList;
+        arr = oldList.map((item) => {
+          return { alarmType: item.alarmType, id: item.id };
+        });
+        confirmAlart(arr).then((res) => {
+          if (res.code === 200) {
+            this.BASE.showMsg({
+              type: "success",
+              msg: "确认成功",
+            });
+            this.warnList = [];
+            this.$emit("confirmed", true);
+          }
+        });
+      });
     },
-
-    getAlartLevelName(lv) {
-      if (lv === 1) {
-        return "低级";
-      } else if (lv === 2) {
-        return "低中级";
-      } else if (lv === 3) {
-        return "中级";
-      } else if (lv === 4) {
-        return "中高级";
-      } else if (lv === 5) {
-        return "高级";
-      }
+    setAlarmConfig() {
+      this.$emit("setConfig");
     },
   },
 };
@@ -382,101 +387,8 @@ export default {
     }
   }
 }
-.setting-dialog {
-  position: absolute;
-  right: -12px;
-  bottom: -6px;
-  z-index: 1001;
-  width: 540px;
-  height: 510px;
-  .setting-wrapper {
-    width: 100%;
-    height: 100%;
-    border-radius: 6px;
-    background: url("~@/assets/imgs/warn-border.png") no-repeat;
-    background-size: 100% 100%;
-    .box-title {
-      width: 100%;
-      height: 60px;
-      padding: 0 22px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      background: url("~@/assets/imgs/warn-top.png") no-repeat;
-      background-size: 100% 100%;
-      .warn-close {
-        cursor: pointer;
-      }
-    }
-    .box-content {
-      height: calc(100% - 60px);
-      padding: 0 10px;
-      .btnBox {
-        .el-button ::v-deep {
-          width: 100px;
-          background: url("~@/assets/imgs/confirmone.png") no-repeat;
-          background-size: 100% 100%;
-          height: 37px;
-          border-radius: 5px;
-          border-width: 0;
-          color: #b6afaf;
-          font-size: 16px;
-          margin-top: 10px;
-          opacity: 0.8;
-          &:hover,
-          &:focus {
-            color: #fff;
-            opacity: 1;
-            background-color: transparent;
-            border-width: 0;
-          }
-          &.cancle {
-            background: #ccc;
-            color: #3a3838;
-            &:hover,
-            &:focus {
-              color: #000;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-.el-tabs ::v-deep {
-  height: calc(100% - 80px);
-  &.el-tabs--border-card {
-    background: transparent !important;
-    border-color: transparent !important;
-  }
-  &.el-tabs--border-card > .el-tabs__header {
-    background: transparent !important;
-    border-color: transparent !important;
-  }
-
-  &.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active,
-  &.el-tabs--border-card > .el-tabs__header .el-tabs__item:hover {
-    color: #fd7f00 !important;
-    background: transparent !important;
-    border-right-color: transparent !important;
-    border-left-color: transparent !important;
-  }
-}
-.el-form::v-deep {
-  .el-form-item__label {
-    color: #ccc;
-  }
-}
-.el-switch::v-deep {
-  &.is-checked .el-switch__core {
-    border-color: #fd7f00;
-    background-color: #fd7f00;
-  }
-  .el-switch__label {
-    color: #ccc;
-    &.is-active {
-      color: #fd7f00;
-    }
-  }
+::v-deep .el-table__header-wrapper .el-checkbox {
+  // display: none;//设置不成功，页面卡顿
+  visibility: hidden;
 }
 </style>

src/components/other/healthReport/index.vue

@@ -194,7 +194,7 @@
               reportInfo1.y511mqxpcl
             }}%，风速在11-25m/s区间曲线偏差率为{{
               reportInfo1.y11mycqxpcl
-            }}%，总体低于该型号机组平均值（{{ reportInfo1.yqxpcbhb || 0 }}%）。
+            }}%。
           </el-form-item>
           <div>
             <div class="logHead">功率曲线拟合</div>
@@ -418,14 +418,14 @@
         </el-form>
       </div>
 
-      <div class="textBox">
+      <!-- <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2">故障分类：</el-form-item>
           <el-form-item class="text-indent-2">
             统计周期内，机舱振动类故障频次为88次，持续时长51分钟。（只显示发生故障的，如没有发生过故障的不用文字描述）
           </el-form-item>
-          <!-- 其中以（明细故障mwData）发生频次最高，为mwData次；（明细故障mwData）次之，为mwData次；（明细故障mwData）第三，为mwData次。 -->
-          <!-- <div class="logHead">故障分类统计</div> -->
+         其中以（明细故障mwData）发生频次最高，为mwData次；（明细故障mwData）次之，为mwData次；（明细故障mwData）第三，为mwData次。 -->
+      <!-- <div class="logHead">故障分类统计</div>
           <el-table
             empty-text="暂无数据"
             :data="faultclass"
@@ -468,9 +468,9 @@
             </el-table-column>
           </el-table>
         </el-form>
-      </div>
+      </div> -->
 
-      <div class="textBox">
+      <!-- <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2"
             >功率对部件温度影响</el-form-item
@@ -508,7 +508,7 @@
             <el-table-column prop="min1350" label="1350-1500"></el-table-column>
           </el-table>
         </el-form>
-      </div>
+      </div> -->
 
       <div class="textBox">
         <el-form>
@@ -814,7 +814,7 @@
             :cell-style="columnStyle"
             border
             stripe
-            max-height="300"
+   
             style="width: 100%; margin: 10px 0"
           >
             <el-table-column prop="name" label="指标" />
@@ -856,7 +856,7 @@
             :cell-style="columnStyle"
             border
             stripe
-            max-height="300"
+   
             style="width: 100%; margin: 10px 0"
           >
             <el-table-column prop="name" label="指标" />
@@ -927,7 +927,6 @@
                 :header-cell-style="{ color: '#000', background: '#fff' }"
                 border
                 stripe
-                max-height="570"
                 style="width: 100%"
               >
                 <el-table-column prop="types" label="类型" />
@@ -951,7 +950,7 @@
     </div>
   </el-dialog>
 </template>
- 
+
 <script>
 import DoubleLineChart from "@com/chart/line/double-line-chart.vue";
 // import ScatterLineChart from "@com/chart/combination/scatter-line-chart.vue";
@@ -1965,7 +1964,7 @@ export default {
   },
 };
 </script>
- 
+
 <style lang="less" scoped>
 .cDialog {
   position: relative;
@@ -2056,7 +2055,7 @@ export default {
   text-indent: 4em;
 }
 </style>
- 
+
 <style lang="less">
 .cDialog {
   .cell {
@@ -2099,4 +2098,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/router/index.js

@@ -48,6 +48,218 @@ export const asyncRoutes = [
     },
     children: [
       {
+        path: "factoryMonitor/windPowerPlant",
+        redirect: { name: "windhome" },
+        component: () =>
+          import("@/views/stateMonitor/factoryMonitor/windPowerPlant"),
+        name: "windPowerPlant",
+        meta: {
+          title: "风电场站",
+          icon: "svg-fengdian",
+          permissions: ["jn_fdcz"],
+        },
+        showChild: true,
+        children: [
+          {
+            path: "windhome",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/windPowerPlant/windhome"
+              ),
+            name: "windhome",
+            meta: {
+              title: "场站监视",
+              icon: "svg-station-surveillance",
+              permissions: ["jn_fdcz_czjs"],
+            },
+          },
+          {
+            path: "DataTarget",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/windPowerPlant/DataTarget"
+              ),
+            name: "DataTarget",
+            meta: {
+              title: "数据指标",
+              icon: "svg-s指标列表",
+              permissions: ["jn_fdcz_sjzb"],
+            },
+          },
+          {
+            path: "matrixMonitor",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/windPowerPlant/matrixMonitor"
+              ),
+            name: "matrixMonitor",
+            meta: {
+              title: "矩阵监视",
+              icon: "svg-matrix",
+              permissions: ["jn_fdcz_jzjs"],
+            },
+          },
+          {
+            path: "draughtFan",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/windPowerPlant/draughtFan"
+              ),
+            name: "draughtFan",
+            meta: {
+              title: "风机设备",
+              icon: "svg-wind-site",
+              permissions: ["jn_fdcz_fjsb"],
+            },
+          },
+          {
+            path: "boosterStation",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation"
+              ),
+            name: "boosterStation",
+            meta: {
+              title: "升压站",
+              icon: "svg-s升压站",
+              permissions: ["jn_fdcz_syz"],
+            },
+          },
+          {
+            path: "windPower",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/windPowerPlant/windPower"
+              ),
+            name: "windPower",
+            meta: {
+              title: "测风塔",
+              permissions: ["jn_fdcz_cft"],
+              icon: "svg-s测风塔",
+            },
+          },
+          {
+            path: "geomorphologicMap",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap"
+              ),
+            name: "geomorphologicMap",
+            meta: {
+              title: "地貌图",
+              permissions: ["jn_fdcz_dmt"],
+              icon: "svg-s地图",
+            },
+          },
+        ],
+      },
+      {
+        path: "factoryMonitor/photovoltaic",
+        redirect: { name: "lighthome" },
+        component: () =>
+          import("@/views/stateMonitor/factoryMonitor/photovoltaic"),
+        name: "photovoltaic",
+        meta: {
+          title: "光伏场站",
+          icon: "svg-guangfu",
+          permissions: ["jn_gfcz"],
+        },
+        showChild: true,
+        children: [
+          {
+            path: "lighthome",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/photovoltaic/lighthome"
+              ),
+            name: "lighthome",
+            meta: {
+              title: "场站监视",
+              icon: "svg-station-surveillance",
+              permissions: ["jn_gfcz_czjs"],
+            },
+          },
+          {
+            path: "lightDataTarget",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/photovoltaic/lightDataTarget"
+              ),
+            name: "lightDataTarget",
+            meta: {
+              title: "数据指标",
+              permissions: ["jn_gfcz_sjzb"],
+              icon: "svg-s指标列表",
+            },
+          },
+          {
+            path: "lightMatrixMonitor",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/photovoltaic/lightMatrixMonitor"
+              ),
+            name: "lightMatrixMonitor",
+            meta: {
+              title: "矩阵监视",
+              permissions: ["jn_gfcz_jzjs"],
+              icon: "svg-matrix",
+            },
+          },
+          {
+            path: "lightMatrix",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/photovoltaic/lightMatrix"
+              ),
+            name: "lightMatrix",
+            meta: {
+              title: "分类矩阵",
+              permissions: ["jn_gfcz_fljz"],
+              icon: "svg-fljz",
+            },
+          },
+          {
+            path: "photovoltaicFacility",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/photovoltaic/photovoltaicFacility"
+              ),
+            name: "photovoltaicFacility",
+            meta: {
+              title: "光伏设备",
+              permissions: ["jn_gfcz_gfsb"],
+              icon: "svg-photovoltaic",
+            },
+          },
+          {
+            path: "lightBoosterStation",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/photovoltaic/lightBoosterStation"
+              ),
+            name: "lightBoosterStation",
+            meta: {
+              title: "升压站",
+              permissions: ["jn_gfcz_syz"],
+              icon: "svg-s升压站",
+            },
+          },
+          {
+            path: "lightGeomorphologicMap",
+            component: () =>
+              import(
+                "@/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap"
+              ),
+            name: "lightGeomorphologicMap",
+            meta: {
+              title: "地貌图",
+              permissions: ["jn_gfcz_dmt"],
+              icon: "svg-s地图",
+            },
+          },
+        ],
+      },
+      {
         path: "lightmatrix", // 基础矩阵
         name: "LightMatrix",
         component: () => import("@/views/stateMonitor/LightMatrix"),
@@ -110,6 +322,7 @@ export const asyncRoutes = [
           icon: "svg-single-station-surveillance",
           permissions: ["jn_czjs"],
         },
+        hidden: true,
         children: [
           {
             path: "windPowerPlant",
@@ -769,6 +982,18 @@ export const asyncRoutes = [
           permissions: ["jn_glycfx"],
         },
       },
+      //光伏电量分析
+      {
+        path: "monthElectricAnalyseGf",
+        component: () =>
+          import("@/views/economicsOperation/monthElectricAnalyseGf/index.vue"),
+        name: "monthElectricAnalyseGf",
+        meta: {
+          title: "光伏电量分析",
+          icon: "svg-dlfx",
+          permissions: ["jn_glycfx"],
+        },
+      },
       //综合管控KPI
       {
         path: "comprehensiveControl",
@@ -1193,16 +1418,6 @@ export const asyncRoutes = [
         component: () => import("@/views/report/stationReport"),
         children: [
           {
-            path: "scrb",
-            name: "scrb",
-            component: () => import("@/views/report/stationReport/scrb"),
-            meta: {
-              title: "晋能清洁能源生产日报",
-              icon: "",
-              permissions: ["jn_zdz_scrb"],
-            },
-          },
-          {
             path: "fdxnyrb",
             name: "fdxnyrb",
             component: () => import("@/views/report/stationReport/fdxnyrb"),
@@ -1223,6 +1438,16 @@ export const asyncRoutes = [
             },
           },
           {
+            path: "scrb",
+            name: "scrb",
+            component: () => import("@/views/report/stationReport/scrb"),
+            meta: {
+              title: "晋能清洁能源生产日报",
+              icon: "",
+              permissions: ["jn_zdz_scrb"],
+            },
+          },
+          {
             path: "gjyrbb",
             name: "gjyrbb",
             component: () => import("@/views/report/stationReport/rbb"),

src/store/index.js

@@ -13,7 +13,7 @@ const state = {
   menuData: [],
   windturbineMap: {},
   moudleName: localStorage.getItem("ModuleName") || "",
-  isFixed: JSON.parse(localStorage.getItem("isFixed")) || false,
+  isFixed: JSON.parse(localStorage.getItem("isFixed")) || true,
   boosterList: JSON.parse(localStorage.getItem("boosterList")) || [],
   cftList: JSON.parse(localStorage.getItem("cftList")) || [],
   boosterAlarm: JSON.parse(localStorage.getItem("boosterAlarm")) || 0,
@@ -92,9 +92,6 @@ const mutations = {
   emptyWarning(state) {
     state.warnList = [];
   },
-  changeSetConfig(state, data) {
-    state.setConfig += 1;
-  },
 };
 
 const actions = {

src/views/Home/components/map.vue

@@ -39,7 +39,11 @@
                   ? (
                       StationinformationData?.station[wpId]?.zjrl / 1000
                     ).toFixed(2)
-                  : StationinformationData?.qt?.zzjrl
+                  : activeTab == 0
+                  ? StationinformationData?.qt?.zzjrl
+                  : activeTab == -1
+                  ? StationinformationData?.qt?.fdzzjrl
+                  : StationinformationData?.qt?.gfzzjrl
               }}
             </span>
             <span class="unit-t">MW</span>
@@ -285,7 +289,7 @@
               <svg-icon class="" svgid="svg-煤" />
             </div>
             <p class="eco_val text-ellipsis">
-              {{ (StationinformationData?.qt.jym ).toFixed(2) }}
+              {{ (StationinformationData?.qt.jym).toFixed(2) }}
             </p>
             <p class="eco_name">煤</p>
           </li>
@@ -294,7 +298,7 @@
               <svg-icon class="" svgid="svg-水" />
             </div>
             <p class="eco_val text-ellipsis">
-              {{ (StationinformationData?.qt.jys ).toFixed(2) }}
+              {{ (StationinformationData?.qt.jys).toFixed(2) }}
             </p>
             <p class="eco_name">水</p>
           </li>
@@ -305,7 +309,7 @@
               </div>
             </div>
             <p class="eco_val text-ellipsis">
-              {{ (StationinformationData?.qt.co2 ).toFixed(2) }}
+              {{ (StationinformationData?.qt.co2).toFixed(2) }}
             </p>
             <p class="eco_name">二氧化碳</p>
           </li>
@@ -316,7 +320,7 @@
               </div>
             </div>
             <p class="eco_val text-ellipsis">
-              {{ (StationinformationData?.qt.so2 ).toFixed(2) }}
+              {{ (StationinformationData?.qt.so2).toFixed(2) }}
             </p>
             <p class="eco_name">二氧化硫</p>
           </li>
@@ -659,9 +663,7 @@
                 </div>
                 <div class="save-value">
                   {{
-                    Number(
-                      Number(StationinformationData?.qt?.jym)
-                    ).toFixed(2)
+                    Number(Number(StationinformationData?.qt?.jym)).toFixed(2)
                   }}
                 </div>
                 <div class="save-name">煤</div>
@@ -672,9 +674,7 @@
                 </div>
                 <div class="save-value">
                   {{
-                    Number(
-                      Number(StationinformationData?.qt?.jys)
-                    ).toFixed(2)
+                    Number(Number(StationinformationData?.qt?.jys)).toFixed(2)
                   }}
                 </div>
                 <div class="save-name">水</div>
@@ -687,9 +687,7 @@
                 </div>
                 <div class="save-value">
                   {{
-                    Number(
-                      Number(StationinformationData?.qt?.co2)
-                    ).toFixed(2)
+                    Number(Number(StationinformationData?.qt?.co2)).toFixed(2)
                   }}
                 </div>
                 <div class="save-name">二氧化碳</div>
@@ -702,9 +700,7 @@
                 </div>
                 <div class="save-value">
                   {{
-                    Number(
-                      Number(StationinformationData?.qt?.so2) 
-                    ).toFixed(2)
+                    Number(Number(StationinformationData?.qt?.so2)).toFixed(2)
                   }}
                 </div>
                 <div class="save-name">二氧化硫</div>
@@ -1378,6 +1374,7 @@ export default {
       flag: false, //判断场站id
       ForecastPowerNewHome_fc: [], //全国的风电发电量列表
       ForecastPowerNewHome_gf: [], //全国的光伏发电量列表
+      ForecastPowerNewHome_qy: [], //区域发电量列表
       fdlList: [], //山西区域实时负荷列表
       homeSuspensionWindowsData: [], //全国区域所有地区数据
       historyWpId: "", //历史场站id

src/views/economicsOperation/analyse/standAloneAnalyse/historyDetail.vue

@@ -112,7 +112,6 @@ export default {
         currentPage: 1,
         total: 0,
       },
-      //   tabIndex: -1,
       //   tabOptions: [
       //     { id: -1, name: "风电" },
       //     { id: -2, name: "光伏" },
@@ -223,11 +222,11 @@ export default {
   //   },
 
   methods: {
-    init(row) {
+    async init(row) {
       //   this.hiscompanyVal = row.companyId;
       this.hisstationVal = row.windtpowerstationId;
       this.hiswindVal = row.windturbineId || row.wtid;
-      this.getTableData();
+      await this.getTableData();
     },
     dateTimeFn(row) {
       return row.recordDate
@@ -289,7 +288,7 @@ export default {
         wpId: this.hisstationVal,
         wtId: this.hiswindVal,
       };
-      let datas = {};
+      let datas = [];
       if (this.tabIndex == -1) {
         datas = await getApihistorywindturbinegoodnesslist(params);
         this.historysingleMachineData = datas.data.data.records;

src/views/economicsOperation/analyse/standAloneAnalyse/index.vue

@@ -141,6 +141,7 @@
       v-model="dialogVisible"
       width="100%"
       custom-class="windhistoryDetailModel"
+      destroy-on-close
       :close-on-click-modal="false"
       fullscreen
     >
@@ -164,6 +165,7 @@
       custom-class="windDetailmodal"
       :close-on-click-modal="false"
       fullscreen
+      destroy-on-close
     >
       <template #title>
         <div class="dialog-title">
@@ -389,7 +391,7 @@ export default {
           row.windtpowerstationId = this.stationVal;
           this.$refs.windhistoryDetail.init(row);
         }
-        this.$refs.windhistoryDetail.getWindPowerStation();
+        // this.$refs.windhistoryDetail.getWindPowerStation();
       });
     },
     downXlsxFn() {
@@ -560,13 +562,11 @@ export default {
     .el-pagination {
       display: flex;
       justify-content: flex-end;
-    padding-top: 5px;
+      padding-top: 5px;
 
-  
       .el-pagination__total,
       .el-pagination__jump {
         color: #fff;
- 
       }
     }
 

src/views/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue

@@ -153,7 +153,7 @@
             :prop="item.code"
             :label="item.name"
             :width="
-              item.code == 'name' ? 148 : item.name.length == 2 ? 95 : 120
+              item.code == 'name' ? 143 : item.name.length == 2 ? 85 : 110
             "
             show-overflow-tooltip
           >

src/views/economicsOperation/monthElectricAnalyseGf/components/lineCharts.vue

@@ -0,0 +1,256 @@
+<template>
+  <div class="chart" :id="id"></div>
+</template>
+
+<script>
+import util from "@/helper/util.js";
+import partten from "@/helper/partten.js";
+import * as echarts from "echarts";
+import dayjs from "dayjs";
+export default {
+  name: "yfdl-multiple-bar-chart",
+  componentName: "yfdl-multiple-bar-chart",
+  props: {
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "100%",
+    },
+
+    // 传入数据
+    list: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      id: "",
+      chart: null,
+      firstAnimation: true,
+    };
+  },
+  computed: {
+    xdata() {
+      return [
+        "一月",
+        "二月",
+        "三月",
+        "四月",
+        "五月",
+        "六月",
+        "七月",
+        "八月",
+        "九月",
+        "十月",
+        "十一月",
+        "十二月",
+      ];
+    },
+    series() {
+      let result = [];
+      if (this.list && this.list.length > 0) {
+        this.list.forEach((listItem, index) => {
+          let seriesItem = {
+            yAxisIndex: 0,
+            name: listItem?.name,
+            type: "bar",
+            data: listItem?.data,
+            itemStyle: {
+              color: listItem.color,
+            },
+            barWidth: "20%",
+          };
+          if (index == 3) {
+            seriesItem = {
+              yAxisIndex: 1,
+              name: listItem?.name,
+              type: "line",
+              smooth: true,
+              data: listItem?.data,
+              itemStyle: {
+                color: listItem.color,
+              },
+            };
+          }
+
+          result.push(seriesItem);
+        });
+      }
+      return result;
+    },
+  },
+  methods: {
+    resize() {
+      this.initChart();
+    },
+    initChart() {
+      let chart = echarts.init(this.$el);
+      let option = {
+        tooltip: {
+          trigger: "axis",
+          backgroundColor: "rgba(5, 187, 76,0.35)",
+          borderColor: "#05bb4c",
+          formatter: function (params) {
+            var htmlStr = `<div style='margin-bottom:5px'>${params[0].axisValue}</div>`;
+            for (var i = 0; i < params.length; i++) {
+              htmlStr += `<div style='margin-bottom:2px'>`;
+              var param = params[i];
+              var seriesName = param.seriesName; //图例名称
+              var value = param.value; //y轴值
+              var data = param.data; //单位判断code
+              var mark = param.marker; //点
+              var unit = `<span style='font-size:14px'>`;
+
+              htmlStr += mark; //一个点
+              htmlStr += `${seriesName} : ${
+                value != null ? value + unit + ` 万kWh</span>` : "--"
+              }`; //圆点后面显示的文本
+              htmlStr += "</div>";
+            }
+            return htmlStr;
+          },
+          padding: [10, 10, 3, 10],
+          textStyle: {
+            color: "#fff",
+            fontSize: 16,
+          },
+          axisPointer: {
+            type: "shadow",
+            shadowStyle: {
+              color: "rgba(105,105,105, .05)",
+              width: "1",
+            },
+          },
+        },
+        legend: {
+          show: true,
+          data: this.list.map((i) => i?.name),
+          right: 56,
+          icon: "ract",
+          itemWidth: 8,
+          itemHeight: 8,
+          inactiveColor: partten.getColor("gray"),
+          textStyle: {
+            fontSize: 12,
+            color: partten.getColor("grayl"),
+          },
+        },
+        grid: {
+          top: "10%",
+          left: "2%",
+          right: "4%",
+          bottom: "5%",
+          containLabel: true,
+        },
+        xAxis: [
+          {
+            type: "category",
+            data: this.xdata,
+            nameLocation: "center",
+            axisPointer: {
+              type: "shadow",
+            },
+            axisLine: {
+              lineStyle: {
+                color: "#93989A",
+              },
+            },
+            axisLabel: {
+              textStyle: {
+                fontSize: 14,
+                color: "#93989A",
+              },
+            },
+          },
+        ],
+        yAxis: [
+          {
+            type: "value",
+            name: "单位：万千瓦时",
+            nameTextStyle: {
+              color: "#93989A",
+            },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: "rgba(96,103,105,0.3)",
+                type: "dashed",
+              },
+            },
+            axisLabel: {
+              textStyle: {
+                fontSize: 14,
+                color: "#93989A",
+              },
+            },
+          },
+          {
+            type: "value",
+            name: "单位：W/m²",
+            nameTextStyle: {
+              color: "#93989A",
+            },
+            splitLine: {
+              show: false,
+            },
+            axisLabel: {
+              textStyle: {
+                fontSize: 14,
+                color: "#93989A",
+              },
+            },
+          },
+        ],
+        series: this.series,
+      };
+      chart.clear();
+      chart.setOption(option);
+
+      this.resize = function () {
+        chart.resize();
+      };
+
+      window.addEventListener("resize", this.resize);
+    },
+  },
+  created() {
+    this.$nextTick(() => {
+      this.id = "pie-chart-" + util.newGUID();
+    });
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.$el.style.width = this.width;
+      this.$el.style.height = this.height;
+      this.initChart();
+      this.firstAnimation = false;
+    });
+  },
+  updated() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+  unmounted() {
+    window.removeEventListener("resize", this.resize);
+  },
+
+  watch: {
+    "$store.state.themeName"() {
+      this.initChart();
+    },
+  },
+};
+</script>
+
+<style lang="less">
+.chart {
+  width: 100%;
+  height: 100%;
+  display: inline-block;
+}
+</style>

src/views/economicsOperation/monthElectricAnalyseGf/index.vue

@@ -0,0 +1,347 @@
+<template>
+  <div class="parcel-box">
+    <div class="search">
+      <div class="search-left">
+        <el-select
+          size="mini"
+          v-model="company"
+          placeholder="请选择"
+          @change="companyChanged"
+        >
+          <el-option
+            v-for="item in companyOptions"
+            :key="item.id"
+            :label="item.aname"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          size="mini"
+          v-model="station"
+          placeholder="请选择"
+          style="margin-left: 15px"
+          @change="stationChanged"
+        >
+          <el-option
+            v-for="item in stationOptions"
+            :key="item.id"
+            :label="item.aname"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+        <el-button round size="mini" class="searchColor" @click="getDatas"
+          >搜索</el-button
+        >
+      </div>
+    </div>
+    <div
+      class="parcel-content"
+      v-loading="loading"
+      element-loading-background="rgba(4, 12, 11, 0.8)"
+    >
+      <!-- <img src="@/assets/imgs/glycfx-bg1.png" alt="" /> -->
+      <div class="line clearfix">
+        <div class="leftContent">
+          <span>{{ selectValue }}</span>
+        </div>
+      </div>
+      <div class="table-wrapper">
+        <el-table
+          :data="tableData"
+          size="mini"
+          stripe
+          width="100%"
+          height="100%"
+        >
+          <el-table-column
+            v-for="(item, index) in tableHead"
+            :label="item"
+            :key="index"
+            align="center"
+            :width="item == '指标名称' ? '200px' : ''"
+            show-overflow-tooltip
+          >
+            <template #default="scope">
+              <span>
+                {{
+                  scope.row[index] || scope.row[index] == 0
+                    ? scope.row[index]
+                    : "--"
+                }}
+              </span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="echarts">
+        <div class="chart-wrapper">
+          <LineCharts :list="list" width="100%" height="100%" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import LineCharts from "./components/lineCharts.vue";
+import { companys } from "@/api/curveAnalyse";
+import { GetStationByCompany } from "@/api/factoryMonitor/index.js";
+import { getMonthElectricAnalyseGf } from "@/api/monthlyPerformanceAnalysis.js";
+export default {
+  name: "monthElectricAnalyseGf",
+  components: {
+    // ChartColumnar,
+    // Panel,
+    LineCharts,
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      barList: [],
+      tableData: [],
+      tableHead: [
+        "指标名称",
+        "一月",
+        "二月",
+        "三月",
+        "四月",
+        "五月",
+        "六月",
+        "七月",
+        "八月",
+        "九月",
+        "十月",
+        "十一月",
+        "十二月",
+        "合计",
+      ],
+      company: "",
+      companyOptions: [],
+      station: "",
+      stationOptions: [],
+      selectValue: "光伏电量分析",
+      headers: [
+        "计划电量",
+        "实发电量",
+        "可研电量",
+        "完成情况(%)",
+        "可研完成情况(%)",
+        "日照强度(W/m²)",
+        "等效发电小时(h)",
+      ],
+    };
+  },
+  watch: {},
+  created() {
+    this.initialization();
+  },
+  methods: {
+    initialization() {
+      companys().then(({ data: res }) => {
+        if (res.data) {
+          this.companyOptions = [res.data[1]];
+          this.company = res.data[1].id;
+          this.getStation();
+        }
+      });
+    },
+    companyChanged() {
+      this.station = "";
+      this.getStation();
+    },
+    getStation() {
+      GetStationByCompany({ companyids: this.company, type: -2 }).then(
+        ({ data: res, code }) => {
+          if (res.code == 200) {
+            this.stationOptions = res.data;
+            this.station = this.stationOptions[0].id;
+            this.getDatas();
+          }
+        }
+      );
+    },
+    getDatas() {
+      this.loading = true;
+      getMonthElectricAnalyseGf({ wpId: this.station }).then(
+        ({ data, code }) => {
+          if (code == 200) {
+            //合计列
+            let hj = [
+              data.jhdlhj,
+              data.sjdlhj,
+              data.kydlhj,
+              data.wcqkhj + "%",
+              data.kywcqkhj + "%",
+              data.rzqdhj,
+              data.dxxsshj,
+            ];
+            //处理纵向表格数据
+            let resData = JSON.parse(JSON.stringify(data.value));
+            // 数组按矩阵思路, 变成转置矩阵
+            let matrixData = resData.map((row) => {
+              let arr = [];
+              for (let key in row) {
+                if (key != "hours") {
+                  if (key == "wcqk" || key == "kywcqk") {
+                    arr.push(row[key] ? row[key] + "%" : row[key]);
+                  } else {
+                    arr.push(row[key]);
+                  }
+                }
+              }
+              return arr;
+            });
+            // 加入标题拼接最终的数据
+            this.tableData = matrixData[0].map((col, i) => {
+              let newArr = new Array(
+                this.tableHead.length - matrixData.length - 2
+              ).fill(null);
+              let array = [
+                this.headers[i],
+                ...matrixData.map((row) => {
+                  return row[i];
+                }),
+                ...newArr,
+                hj[i],
+              ];
+              return array;
+            });
+
+            //处理图表数据
+            let list = [
+              {
+                name: "计划电量",
+                data: resData.map((ele) => ele.jhdl),
+                color: "#4B55AE",
+              },
+              {
+                name: "实发电量",
+                data: resData.map((ele) => ele.sjdl),
+                color: "#05BB4C",
+              },
+              {
+                name: "可研电量",
+                data: resData.map((ele) => ele.sjdl),
+                color: "#21a4f7",
+              },
+              {
+                name: "日照强度",
+                data: resData.map((ele) => ele.rzqd),
+                color: "#FF8300",
+              },
+            ];
+            this.list = list;
+            this.loading = false;
+          }
+        }
+      );
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.parcel-box {
+  padding: 0 20px;
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+
+  .search {
+    display: flex;
+    flex-direction: row;
+    padding: 15px 0;
+    align-items: center;
+    justify-content: space-between;
+
+    .search-left {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
+
+    .search-right {
+      position: relative;
+
+      .select-back {
+        position: absolute;
+        right: 5px;
+        top: 0px;
+        z-index: 0;
+      }
+
+      .title-select {
+        z-index: 2;
+      }
+    }
+
+    button {
+      margin-left: 10px;
+      background: rgba(67, 81, 107, 0.3);
+      border: 1px solid #274934;
+      color: #b3b3b3;
+    }
+
+    .searchColor {
+      background-color: rgba(5, 187, 76, 0.2);
+      border: 1px solid #3b6c53;
+      color: #b3b3b3;
+      font-size: 14px;
+
+      &:hover {
+        background-color: rgba(5, 187, 76, 0.5);
+        color: #ffffff;
+      }
+    }
+  }
+  .parcel-content {
+    width: 100%;
+    height: calc(100% - 88px);
+    // position: relative;
+    background: url("~@/assets/imgs/glycfx-bg1.png") no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+    img {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+    }
+    .line {
+      .leftContent {
+        width: 242px;
+        height: 45px;
+        line-height: 45px;
+        background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
+
+        span {
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #05bb4c;
+          margin-left: 25px;
+        }
+      }
+    }
+
+    .echarts {
+      height: calc(100% - 310px - 45px);
+      padding: 0 20px;
+      .chart-wrapper {
+        height: 100%;
+        width: 100%;
+      }
+    }
+    .table-wrapper {
+      height: 310px;
+      width: 100%;
+      padding: 0 20px;
+      padding-top: 10px;
+    }
+  }
+}
+</style>

src/views/economicsOperation/performanceEvalute/performanceEvaluation/index.vue

@@ -38,18 +38,17 @@
           时间
           <div class="">
             <el-date-picker
-              v-if="tabIndex == 0"
+              v-if="tabIndex == 'day'"
               size="mini"
               v-model="pickerTimer"
               type="date"
               value-format="YYYY-MM-DD"
               placeholder="选择日期"
               popper-class="date-select"
-              @change="historyTimer = pickerTimer"
             >
             </el-date-picker>
             <el-date-picker
-              v-if="tabIndex == 1"
+              v-if="tabIndex == 'month'"
               size="mini"
               v-model="pickerTimer"
               type="month"
@@ -59,7 +58,7 @@
             >
             </el-date-picker>
             <el-date-picker
-              v-if="tabIndex == 2"
+              v-if="tabIndex == 'year'"
               size="mini"
               v-model="pickerTimer"
               type="year"
@@ -74,35 +73,27 @@
           <el-button round size="mini" class="buttons" @click="seachData"
             >搜索</el-button
           >
-          <!-- <el-button
-            round
-            size="mini"
-            class="buttons"
-            @click="contrastFn"
-            :disabled="chooseList.length === 2 ? false : true"
-            >信息对比</el-button
-          > -->
         </div>
       </div>
       <div class="selections">
         <div
           class="selections_btn"
-          @click="tabSelect(0)"
-          :class="{ active: tabIndex == 0 }"
+          @click="tabSelect('day')"
+          :class="{ active: tabIndex == 'day' }"
         >
           日
         </div>
         <div
           class="selections_btn"
-          @click="tabSelect(1)"
-          :class="{ active: tabIndex == 1 }"
+          @click="tabSelect('month')"
+          :class="{ active: tabIndex == 'month' }"
         >
           月
         </div>
         <div
           class="selections_btn"
-          @click="tabSelect(2)"
-          :class="{ active: tabIndex == 2 }"
+          @click="tabSelect('year')"
+          :class="{ active: tabIndex == 'year' }"
         >
           年
         </div>
@@ -123,15 +114,12 @@
         <el-table
           :data="EvaluationData"
           stripe
-          @selection-change="handleCurrentChange"
           size="mini"
           height="calc(100% - 40px)"
           ref="Eval_table"
           style="width: 100%"
         >
-          <el-table-column type="selection" width="60" align="center">
-          </el-table-column>
-          <el-table-column prop="nemCode" label="设备编号" align="center">
+          <el-table-column prop="equipmentId" label="设备编号" align="center">
           </el-table-column>
           <el-table-column
             v-for="(item, index) in tableHeaderGf"
@@ -140,18 +128,7 @@
             :prop="item.code"
             :label="item.title"
             align="center"
-          >
-            <!-- <template #header="scope">
-              <div>
-                {{
-                  scope.column.label.slice(0, scope.column.label.indexOf("("))
-                }}
-              </div>
-              <div>
-                {{ scope.column.label.slice(scope.column.label.indexOf("(")) }}
-              </div>
-            </template> -->
-          </el-table-column>
+          />
         </el-table>
         <div style="text-align: right">
           <el-pagination
@@ -172,8 +149,8 @@
 import {
   getApicompanyslist,
   getApiwpByCplistlist,
-  getApiequipmentinfoDayList,
 } from "@/api/monthlyPerformanceAnalysis";
+import { getApiequipmentinfoDayListGf } from "@/api/powerAnalyse.js";
 // import historyDetail from "./historyDetail.vue";
 // import dayDetailInfo from "./dayDetailInfo.vue";
 import dayjs from "dayjs";
@@ -185,7 +162,7 @@ export default {
   },
   data() {
     return {
-      tabIndex: 0,
+      tabIndex: "day",
       companyVal: "",
       companyOptions: [],
       stationVal: "",
@@ -193,24 +170,10 @@ export default {
       pickerTimer: "",
       EvaluationData: [],
       tableHeaderGf: [
-        // { title: "发电量(kWh)", code: "dayfdl" },
-        // { title: "理论发电量(kWh)", code: "dayllfdl" },
-        // { title: "光照强度(W/㎡)", code: "dayfs" },
-        // { title: "平均功率(KW)", code: "daygl" },
-        // { title: "故障损失(kWh)", code: "daygzssdl" },
-        // { title: "限电损失(kWh)", code: "dayxdssdl" },
-        // { title: "检修损失(kWh)", code: "daywhssdl" },
-        // { title: "性能损失(kWh)", code: "dayxnssdl" },
-        // { title: "利用小时数(h)", code: "daylyxs" },
-        // { title: "拟合优度(%)", code: "daynhyd" },
-        // { title: "可利用率(%)", code: "daysbklyl" },
-        // { title: "可用系数(%)", code: "daydxkyxs" },
-        // { title: "有效光时数(h)", code: "dayyxfss" },
-        // { title: "功率一致性(%)", code: "dayglyzxxs" },
-        { title: "离散率(%)", code: "dayglyzxxs" },
-        { title: "转换效率(%)", code: "dayglyzxxs" },
-        { title: "等价发电时(h)", code: "dayglyzxxs" },
-        { title: "设备可利用率(%)", code: "dayglyzxxs" },
+        { title: "离散率(%)", code: "scatter" },
+        { title: "转换效率(%)", code: "conversionEfficiency" },
+        { title: "等效发电时(h)", code: "equivalentGeneratingTime" },
+        { title: "设备可利用率(%)", code: "deviceAvailability" },
       ],
       dialogVisible: false,
       dialogTitle: "",
@@ -223,7 +186,7 @@ export default {
       ],
       page: {
         currentPage: 1,
-        pagesize: 21,
+        pagesize: 22,
         total: 0,
       },
       historyTimer: "",
@@ -231,6 +194,8 @@ export default {
   },
   created() {
     this.getCompanyData();
+    this.pickerTimer = dayjs().add(-1, "day").format("YYYY-MM-DD");
+    this.historyTimer = dayjs().add(-1, "day").format("YYYY-MM-DD");
   },
   computed: {
     pageHeight() {
@@ -247,14 +212,13 @@ export default {
     // 切换tab
     tabSelect(index) {
       this.tabIndex = index;
-      if (this.tabIndex == 0) {
-        this.pickerTimer = dayjs().format("YYYY-MM-DD");
-      } else if (this.tabIndex == 1) {
-        this.pickerTimer = dayjs().format("YYYY-MM");
-      } else if (this.tabIndex == 2) {
+      if (this.tabIndex == "year") {
         this.pickerTimer = dayjs().format("YYYY");
+      } else if (this.tabIndex == "month") {
+        this.pickerTimer = dayjs().format("YYYY-MM");
+      } else if (this.tabIndex == "day") {
+        this.pickerTimer = dayjs().add(-1, "day").format("YYYY-MM-DD");
       }
-      this.historyTimer = dayjs().format("YYYY-MM-DD");
       this.page.currentPage = 1;
       this.seachData();
     },
@@ -268,8 +232,7 @@ export default {
     // 获取公司列表
     async getCompanyData() {
       this.companyOptions = [];
-      this.pickerTimer = this.getchangeTime(new Date());
-      this.historyTimer = this.getchangeTime(new Date());
+
       const { data: datas } = await getApicompanyslist();
       this.companyOptions = datas.data;
       this.companyVal = datas.data[1]?.id;
@@ -290,7 +253,7 @@ export default {
       };
       const { data: datas } = await getApiwpByCplistlist(params);
       this.stationOptions = datas.data;
-      this.stationVal = datas.data[0].id;
+      this.stationVal = "SXJ_KGDL_HR_GDC_STA";
       this.getTableData();
     },
     changeStation(val) {
@@ -302,62 +265,16 @@ export default {
     },
     async getTableData() {
       let params = {
-        companyId: this.companyVal,
-        date: this.pickerTimer,
-        staType: -1,
-        types: this.tabIndex * 1 + 1,
-        wpId: this.stationVal,
+        time: this.pickerTimer,
+        timeType: this.tabIndex,
+        stationId: this.stationVal,
         type: this.tabEvent,
         pageNum: this.page.currentPage,
         pageSize: this.page.pagesize,
       };
-      const { data: datas } = await getApiequipmentinfoDayList(params);
-      this.EvaluationData = datas.data.records;
-      this.page.total = datas.data.total;
-    },
-    handleCurrentChange(val) {
-      if (val.length > 2) {
-        let del_row = val.shift();
-        this.$refs.Eval_table.toggleRowSelection(del_row, false);
-      }
-      let arr = [];
-      val.forEach((item, index) => {
-        if (index < 2) {
-          arr.push(item);
-        }
-      });
-      this.chooseList = arr;
-    },
-    //转换时间
-    getchangeTime(date) {
-      var y = date.getFullYear();
-      var m = date.getMonth() + 1;
-      m = m < 10 ? "0" + m : m;
-      var d = date.getDate();
-      d = d < 10 ? "0" + d : d;
-      return y + "-" + m + "-" + d;
-    },
-    seachHistoryData(row) {
-      this.dialogVisible = true;
-      this.dialogTitle = "历史数据查询";
-      this.$nextTick(() => {
-        let startT =
-          new Date(this.historyTimer).getTime() - 10 * 24 * 60 * 60 * 1000;
-        this.$refs.windhistoryDetail.pickerTimer = [
-          this.getchangeTime(new Date(startT)),
-          this.historyTimer,
-        ];
-        this.$refs.windhistoryDetail.tabIndex = this.tabIndex * 1 + 1;
-        this.$refs.windhistoryDetail.tabEvent = this.tabEvent;
-        this.$refs.windhistoryDetail.init(row);
-      });
-    },
-    contrastFn() {
-      this.contrastVisible = true;
-      this.$nextTick(() => {
-        this.$refs.MessageContrast.tabIndex = this.tabIndex * 1 + 1;
-        this.$refs.MessageContrast.init();
-      });
+      const { data } = await getApiequipmentinfoDayListGf(params);
+      this.EvaluationData = data.records;
+      this.page.total = data.total;
     },
   },
 };

src/views/economicsOperation/powerCurve/powerLinefitting/index.vue

@@ -62,14 +62,40 @@
           </el-select>
         </div>
         <div class="but">
-          <el-button round size="mini" class="buttons" @click="seachData"
-            >拟合</el-button
+          <el-button round size="mini" class="search" @click="seachData"
+            >拟 合</el-button
           >
-          <el-button round size="mini" class="buttons" @click="downXlsxFn"
-            >导出</el-button
+
+          <el-button
+            class="selections_btn"
+            size="mini"
+            @click="dataFilter(0)"
+            :class="{ active: toFixed == 0 }"
+          >
+            仅显示整数行
+          </el-button>
+          <el-button
+            class="selections_btn"
+            size="mini"
+            @click="dataFilter(1)"
+            :class="{ active: toFixed == 1 }"
+          >
+            显示一位小数行
+          </el-button>
+          <el-button
+            class="selections_btn"
+            size="mini"
+            @click="dataFilter(2)"
+            :class="{ active: toFixed == 2 }"
+          >
+            显示两位小数行
+          </el-button>
+          <el-button round size="mini" class="download" @click="downXlsxFn"
+            >导 出</el-button
           >
         </div>
       </div>
+
       <div class="selections">
         <div
           class="selections_btn"
@@ -172,6 +198,8 @@ export default {
         { id: -1, name: "风电" },
         { id: -2, name: "光伏" },
       ],
+      toFixed: 0,
+      originData: [],
     };
   },
   created() {
@@ -192,6 +220,42 @@ export default {
     },
   },
   methods: {
+    //过滤数据
+    dataFilter(num) {
+      this.toFixed = num;
+      this.powerLinefittingData = this.filterList(this.toFixed);
+      console.log(this.filterList(this.toFixed));
+    },
+    filterList(num) {
+      let data = JSON.parse(JSON.stringify(this.originData));
+      switch (num) {
+        case 0:
+          return data.filter((item) => {
+            let a = JSON.stringify(item.speed).split(".");
+            if (a.length == 1) {
+              return item;
+            }
+          });
+        case 1:
+          return data.filter((item) => {
+            let a = JSON.stringify(item.speed).split(".");
+            if (a.length == 2) {
+              if (a[1].length == 1) {
+                return item;
+              }
+            }
+          });
+        case 2:
+          return data.filter((item) => {
+            let a = JSON.stringify(item.speed).split(".");
+            if (a.length == 2) {
+              if (a[1].length == 2) {
+                return item;
+              }
+            }
+          });
+      }
+    },
     // 切换tab
     tabSelect(index) {
       this.tabIndex = index;
@@ -271,10 +335,8 @@ export default {
       const { data: datas } = await getApiPerformancecurvefitting(params);
 
       this.changeEchartsData(datas.data.chanrt);
-      datas.data.list.forEach((item) => {
-        item.speed = item.speed.toFixed(2);
-      });
-      this.powerLinefittingData = datas.data.list;
+      this.originData = datas.data.list;
+      this.dataFilter(this.toFixed);
     },
     // 整合echarts数据
     changeEchartsData(datas) {
@@ -486,24 +548,37 @@ export default {
         flex-direction: row;
         align-content: center;
         margin-left: 20px;
-        .buttons:nth-child(1) {
+        .search {
           background: rgba(5, 187, 76, 0.6);
           border: 1px solid #3b6c53;
           border-radius: 13px;
-          color: #fff;
+          color: #b9b9b9;
           &:hover {
             background: rgba(5, 187, 76, 0.9);
             border-radius: 13px;
             color: #fff;
           }
         }
-        .buttons:nth-child(2) {
+        .download {
           background: rgba(67, 81, 107, 0.3);
           border: 1px solid #3b6c53;
           border-radius: 13px;
           font-size: 14px;
           color: #b3b3b3;
         }
+        .selections_btn {
+          background: fade(#3b6c53, 20);
+          border: 1px solid fade(#3b6c53, 20);
+          border-radius: 13px;
+          color: #b9b9b9;
+          &:hover,
+          &.active {
+            background: fade(#05bb4c, 80);
+            border: 1px solid #05bb4c;
+            color: #fff;
+            cursor: pointer;
+          }
+        }
       }
     }
     .selections {
@@ -518,7 +593,7 @@ export default {
         line-height: 33px;
         margin-right: 8px;
         color: #b9b9b9;
-        font-size: 1.296vh;
+        font-size: 16px;
         background: fade(#3b6c53, 20);
         border: 1px solid fade(#3b6c53, 20);
         border-radius: 20px;
@@ -542,7 +617,7 @@ export default {
         font-size: 16px;
         font-family: Microsoft YaHei;
         font-weight: 400;
-        color: #05BB4C;
+        color: #05bb4c;
         margin-left: 25px;
       }
     }

src/views/layout/Menu.vue

@@ -7,9 +7,9 @@
         :key="menu"
         @click="click(index)"
         :class="{ active: activeIndex == index }"
-        @mouseenter="subMenuShow(menu.children, index)"
+        @mouseenter="subMenuShow(menu.children, index, menu.showChild)"
       >
-        <router-link v-if="!menu.children" :to="menu.path">
+        <router-link v-if="!menu.showChild || !menu.children" :to="menu.path">
           <el-tooltip
             class="item"
             effect="dark"
@@ -119,472 +119,16 @@ export default {
         },
         {
           id: "others",
-          text: "其他",
-          data: [
-            // {
-            //   text: "自定制报表管理",
-            //   icon: "svg-自定制报表管理",
-            //   path: "/others/report",
-            //   children: [
-            //     {
-            //       text: "日报表",
-            //       icon: "",
-            //       path: "/others/report/gjyrbb",
-            //     },
-            //     {
-            //       text: "风电场站自定义",
-            //       icon: "",
-            //       path: "/others/report/fdczzdy",
-            //     },
-            //     {
-            //       text: "风电项目自定义",
-            //       icon: "",
-            //       path: "/others/report/fdxmzdy",
-            //     },
-            //   ],
-            // },
-            // {
-            //   text: "统计分析",
-            //   icon: "svg-统计分析",
-            //   path: "/others/tjfx",
-            //   children: [
-            //     {
-            //       text: "统计分析",
-            //       icon: "svg-matrix",
-            //       path: "/others/tjfx",
-            //     },
-            //     {
-            //       text: "表底值查询",
-            //       icon: "svg-matrix",
-            //       path: "/others/bdzcx",
-            //     },
-            //   ],
-            // },
-            // {
-            //   text: "报表管理",
-            //   icon: "svg-报表管理",
-            //   path: "/others/oafd",
-            //   children: [
-            //     {
-            //       text: "OA日报",
-            //       icon: "svg-matrix",
-            //       path: "/others/oafd",
-            //     },
-            //     {
-            //       text: "OA日报(光伏)",
-            //       icon: "svg-matrix",
-            //       path: "/others/oagf",
-            //     },
-            //     {
-            //       text: "新能源日报",
-            //       icon: "svg-matrix",
-            //       path: "/others/xnyrb",
-            //     },
-            //     {
-            //       text: "国电MIS日报(风电)",
-            //       icon: "svg-matrix",
-            //       path: "/others/missfdrb",
-            //     },
-            //     {
-            //       text: "国电MIS日报(光伏)",
-            //       icon: "svg-matrix",
-            //       path: "/others/missgfrb",
-            //     },
-            //     {
-            //       text: "新能源风电生产月报",
-            //       icon: "svg-matrix",
-            //       path: "/others/xnyfdscyb",
-            //     },
-            //     {
-            //       text: "麻黄山生产月报",
-            //       icon: "svg-matrix",
-            //       path: "/others/mhsscyb",
-            //     },
-            //     {
-            //       text: "牛首山生产月报",
-            //       icon: "svg-matrix",
-            //       path: "/others/nssscyb",
-            //     },
-            //     {
-            //       text: "青山生产月报",
-            //       icon: "svg-matrix",
-            //       path: "/others/qsscyb",
-            //     },
-            //     {
-            //       text: "石板泉生产月报",
-            //       icon: "svg-matrix",
-            //       path: "/others/sbqscyb",
-            //     },
-            //     {
-            //       text: "香山生产月报",
-            //       icon: "svg-matrix",
-            //       path: "/others/xsscyb",
-            //     },
-            //     {
-            //       text: "新能源光伏生产月报",
-            //       icon: "svg-matrix",
-            //       path: "/others/xnygfscyb",
-            //     },
-            //     {
-            //       text: "大武口生产月报",
-            //       icon: "svg-matrix",
-            //       path: "/others/dwkscyb",
-            //     },
-            //     {
-            //       text: "平罗生产月报",
-            //       icon: "svg-matrix",
-            //       path: "/others/plscyb",
-            //     },
-            //     {
-            //       text: "宣和生产月报",
-            //       icon: "svg-matrix",
-            //       path: "/others/xhscyb",
-            //     },
-            //   ],
-            // },
-            // {
-            //   text: "原始数据查询",
-            //   icon: "svg-报表首页",
-            //   path: "/others/realSearch",
-            //   children: [
-            //     {
-            //       text: "测点数据查询",
-            //       icon: "svg-wind-site",
-            //       path: "/others/realSearch",
-            //     },
-            //     {
-            //       text: "测点历史数据查询",
-            //       icon: "svg-wind-site",
-            //       path: "/others/historySearch",
-            //     },
-            // {
-            //   text: "气象历史数据",
-            //   icon: "svg-wind-site",
-            //   path: "/others/weather",
-            // },
-            // {
-            //   text: "数据导出",
-            //   icon: "svg-wind-site",
-            //   path: "/others/ExportExcel",
-            // },
-            // {
-            //   text: "设备管理",
-            //   icon: "svg-wind-site",
-            //   path: "/device/device",
-            // },
-            //   ],
-            // },
-            // {
-            //   text: "预警记录",
-            //   icon: "svg-预警记录",
-            //   path: "/others/alarmCenter/alarmcenter",
-            //   children: [
-            //     {
-            //       text: "预警管理",
-            //       icon: "svg-wind-site",
-            //       path: "/others/alarmCenter/alarmcenter",
-            //     },
-            //     {
-            //       text: "停机事件管理",
-            //       icon: "svg-wind-site",
-            //       path: "/others/alarmCenter/tjsj",
-            //     },
-            //     {
-            //       text: "限电管理",
-            //       icon: "svg-wind-site",
-            //       path: "/others/alarmCenter/xdgl",
-            //     },
-            //     {
-            //       text: "升压站报警",
-            //       icon: "svg-wind-site",
-            //       path: "/others/alarmCenter/boosterAlarm",
-            //     },
-            //     {
-            //       text: "SCADA报警",
-            //       icon: "svg-wind-site",
-            //       path: "/others/alarmCenter/scadaAlarm",
-            //     },
-            //     {
-            //       text: "自定义报警",
-            //       icon: "svg-wind-site",
-            //       path: "/others/alarmCenter/customAlarm",
-            //     },
-            //     {
-            //       text: "自定义报警统计",
-            //       icon: "svg-wind-site",
-            //       path: "/others/alarmCenter/customStatistics",
-            //     },
-            //   ],
-            // },
-            // {
-            //   text: "专家知识",
-            //   icon: "svg-专家知识",
-            //   path: "/others/knowledge/knowledge",
-            //   children: [
-            //     {
-            //       text: "故障知识列表",
-            //       icon: "svg-matrix",
-            //       path: "/others/knowledge/knowledge",
-            //     },
-            //     {
-            //       text: "安全措施知识",
-            //       icon: "svg-matrix",
-            //       path: "/others/knowledge/knowledge2",
-            //     },
-            //     {
-            //       text: "排查检修方案",
-            //       icon: "svg-matrix",
-            //       path: "/others/knowledge/knowledge6",
-            //     },
-            //     {
-            //       text: "预警知识",
-            //       icon: "svg-matrix",
-            //       path: "/others/knowledge/knowledge7",
-            //     },
-            //     {
-            //       text: "特征参数",
-            //       icon: "svg-matrix",
-            //       path: "/others/knowledge/knowledge5",
-            //     },
-            // {
-            //   text: "风险辨识知识",
-            //   icon: "svg-matrix",
-            //   path: "/others/knowledge/knowledge3",
-            // },
-            //     {
-            //       text: "作业指导知识",
-            //       icon: "svg-matrix",
-            //       path: "/others/knowledge/knowledge4",
-            //     },
-            //   ],
-            // },
-            // {
-            //   text: "样本库",
-            //   icon: "svg-报表管理",
-            //   path: "/others/fault",
-            //   children: [
-            //     {
-            //       text: "故障训练样本库",
-            //       icon: "svg-matrix",
-            //       path: "/others/fault",
-            //     },
-            //     {
-            //       text: "性能下降样本库",
-            //       icon: "svg-matrix",
-            //       path: "/others/performance",
-            //     },
-            //     {
-            //       text: "预警分析样本库",
-            //       icon: "svg-matrix",
-            //       path: "/others/warning",
-            //     },
-            //     {
-            //       text: "性能预警综合分析",
-            //       icon: "svg-matrix",
-            //       path: "/others/analysis",
-            //     },
-            //     // {
-            //     //   text: "功率曲线综合分析",
-            //     //   icon: "svg-matrix",
-            //     //   path: "/others/powerline/analysis",
-            //     // },
-            //     {
-            //       text: "知识库",
-            //       icon: "svg-matrix",
-            //       path: "/others/knowledgeBase",
-            //     },
-            //     // {
-            //     //   text: "发电能力分析",
-            //     //   icon: "svg-matrix",
-            //     //   path: "/others/abilityAnalysis",
-            //     // },
-            //     // {
-            //     //   text: "风电营销样本库",
-            //     //   icon: "svg-matrix",
-            //     //   path: "/others/market",
-            //     // }
-            //     {
-            //       text: "风机检修规则",
-            //       icon: "svg-matrix",
-            //       path: "/others/overhaulRule",
-            //     },
-            //     {
-            //       text: "故障手册",
-            //       icon: "svg-matrix",
-            //       path: "/others/faultManual",
-            //     },
-            //   ],
-            // },
-          ],
-        },
-        {
-          id: "save",
-          text: "安全管控",
-          data: [
-            {
-              text: "安全管控",
-              icon: "svg-安全管控",
-              path: "/save/personnel",
-              children: [
-                {
-                  text: "人员矩阵",
-                  icon: "svg-wind-site",
-                  path: "/save/personnel",
-                },
-                {
-                  text: "全局监视",
-                  icon: "svg-wind-site",
-                  path: "/globalMonitor",
-                },
-              ],
-            },
-          ],
+          text: "智能报表",
+          data: [],
         },
-        // {
-        //   id: "znbb",
-        //   text: "智能报表",
-        //   data: [
-        //     {
-        //       text: '报表首页',
-        //       icon: 'svg-wind-site',
-        //       path: '/reportPandect'
-        //     },
-        //     // 统计分析
-        //     {
-        //       text: "统计分析",
-        //       icon: "svg-matrix",
-        //       path: "/tjfx",
-        //       children: [
-        //         {
-        //           text: "统计分析",
-        //           icon: "svg-matrix",
-        //           path: "/tjfx",
-        //         },
-        //         {
-        //           text: "表底值查询",
-        //           icon: "svg-matrix",
-        //           path: "/bdzcx",
-        //         },
-        //       ],
-        //     },
-        //     {
-        //       text: "报表管理",
-        //       icon: "svg-matrix",
-        //       path: "/bdzcx",
-        //       children: [
-        //         {
-        //           text: "OA日报",
-        //           icon: "svg-matrix",
-        //           path: "/oafd",
-        //         },
-        //         {
-        //           text: "OA日报(光伏)",
-        //           icon: "svg-matrix",
-        //           path: "/oagf",
-        //         },
-        //         {
-        //           text: "新能源日报",
-        //           icon: "svg-matrix",
-        //           path: "/xnyrb",
-        //         },
-        //         {
-        //           text: "山西晋能MISS日报(风电)",
-        //           icon: "svg-matrix",
-        //           path: "/missfdrb",
-        //         },
-        //         {
-        //           text: "山西晋能MISS日报(光伏)",
-        //           icon: "svg-matrix",
-        //           path: "/missgfrb",
-        //         },
-        //         {
-        //           text: "新能源风电生产月报",
-        //           icon: "svg-matrix",
-        //           path: "/xnyfdscyb",
-        //         },
-        //         {
-        //           text: "麻黄山生产月报",
-        //           icon: "svg-matrix",
-        //           path: "/mhsscyb",
-        //         },
-        //         {
-        //           text: "牛首山生产月报",
-        //           icon: "svg-matrix",
-        //           path: "/nssscyb",
-        //         },
-        //         {
-        //           text: "青山生产月报",
-        //           icon: "svg-matrix",
-        //           path: "/qsscyb",
-        //         },
-        //         {
-        //           text: "石板泉生产月报",
-        //           icon: "svg-matrix",
-        //           path: "/sbqscyb",
-        //         },
-        //         {
-        //           text: "香山生产月报",
-        //           icon: "svg-matrix",
-        //           path: "/xsscyb",
-        //         },
-        //         {
-        //           text: "新能源光伏生产月报",
-        //           icon: "svg-matrix",
-        //           path: "/xnygfscyb",
-        //         },
-        //         {
-        //           text: "大武口生产月报",
-        //           icon: "svg-matrix",
-        //           path: "/dwkscyb",
-        //         },
-        //         {
-        //           text: "平罗生产月报",
-        //           icon: "svg-matrix",
-        //           path: "/plscyb",
-        //         },
-        //         {
-        //           text: "宣和生产月报",
-        //           icon: "svg-matrix",
-        //           path: "/xhscyb",
-        //         },
-        //       ],
-        //     },
-        //     {
-        //       text: "自定制报表管理",
-        //       icon: "svg-matrix",
-        //       path: "/fdczzdy",
-        //       children: [
-        //         {
-        //           text: "风电场站自定义",
-        //           icon: "svg-matrix",
-        //           path: "/fdczzdy",
-        //         },
-        //         {
-        //           text: "风电项目自定义",
-        //           icon: "svg-matrix",
-        //           path: "/fdxmzdy",
-        //         },
-        //         {
-        //           text: "光伏场站自定义",
-        //           icon: "svg-matrix",
-        //           path: "/gfczzdy",
-        //         },
-        //         {
-        //           text: "光伏项目自定义",
-        //           icon: "svg-matrix",
-        //           path: "/gfxmzdy",
-        //         },
-        //       ],
-        //     },
-        //   ],
-        // },
       ],
       activeIndex: 0,
       isShowSubMenu: false,
       parentIndex: null,
       subMenu: [],
       subIndex: null,
-      fixed: false,
+      fixed: true,
     };
   },
   methods: {
@@ -597,15 +141,21 @@ export default {
       this.activeIndex = index;
       this.subIndex = null;
     },
-    subMenuShow(children, index) {
-      if (children) {
-        this.isShowSubMenu = true;
+    subMenuShow(children, index, flag) {
+      if (flag != undefined && !flag) {
+        this.isShowSubMenu = false;
         this.parentIndex = index;
+        this.subMenu = children;
       } else {
-        this.isShowSubMenu = false;
-        this.parentIndex = null;
+        if (children) {
+          this.isShowSubMenu = true;
+          this.parentIndex = index;
+        } else {
+          this.isShowSubMenu = false;
+          this.parentIndex = null;
+        }
+        this.subMenu = children;
       }
-      this.subMenu = children;
     },
     subMenuHide() {
       this.isShowSubMenu = false;
@@ -633,12 +183,23 @@ export default {
             a.children.forEach((path) => {
               if (!path.hidden) {
                 if (path.children) {
-                  currData.push({
-                    text: path.meta.title,
-                    icon: path.meta.icon,
-                    path: `/${this.currRoot}/${path.path}`,
-                    children: [],
-                  });
+                  if (path.showChild) {
+                    currData.push({
+                      text: path.meta.title,
+                      icon: path.meta.icon,
+                      path: `/${this.currRoot}/${path.path}`,
+                      children: [],
+                      showChild: false,
+                    });
+                  } else {
+                    currData.push({
+                      text: path.meta.title,
+                      icon: path.meta.icon,
+                      path: `/${this.currRoot}/${path.path}`,
+                      children: [],
+                    });
+                  }
+
                   let cu = currData.find((i) => i.text == path.meta.title);
                   path.children.forEach((cputh) => {
                     let caputh = "";
@@ -666,6 +227,7 @@ export default {
                 }
               }
             });
+
             this.$store.dispatch("changeMenuData", currData);
             return currData;
           } else {
@@ -689,7 +251,7 @@ export default {
     isFixed: {
       handler(val) {
         if (!val) {
-          this.$store.commit("changeIsFixed", false);
+          this.$store.commit("changeIsFixed", true);
         } else {
           this.fixed = val;
         }

src/views/stateMonitor/alarmCenter/commonAlarm/index.vue

@@ -37,7 +37,7 @@
             </el-option>
           </el-select>
         </div>
-        <div class="select-item" v-if="alarmType == 'windturbine'">
+        <div class="select-item" v-if="alarmType != 'booststation'">
           场站：
           <el-select
             size="mini"
@@ -55,7 +55,7 @@
             </el-option>
           </el-select>
         </div>
-        <div class="select-item" v-if="alarmType == 'windturbine'">
+        <div class="select-item" v-if="alarmType != 'booststation'">
           设备：
           <el-select
             size="mini"
@@ -105,7 +105,7 @@
         </div>
       </div>
       <div class="btns">
-        <el-button round size="mini" class="buttons" @click="getTableData"
+        <el-button round size="mini" class="buttons" @click="getTableData(0)"
           >搜索</el-button
         >
       </div>
@@ -172,6 +172,8 @@ export default {
   components: {},
   data() {
     return {
+      route: { id: "", station: "", wind: "", ts: "", endts: "" },
+      routeFlag: 0,
       station: "",
       wpOptions: [],
       wind: "",
@@ -186,7 +188,11 @@ export default {
         },
         {
           code: "windturbine",
-          name: "设备报警",
+          name: "风机报警",
+        },
+        {
+          code: "inverter",
+          name: "逆变器报警",
         },
       ],
       booststation: "",
@@ -218,7 +224,7 @@ export default {
     };
   },
   created() {
-    this.GetWpOptions();
+    // this.GetWpOptions();
   },
   methods: {
     getTime(endts) {
@@ -237,34 +243,41 @@ export default {
         return "高级";
       }
     },
-    GetWpOptions() {
+    GetWpOptions(flag) {
+      this.routeFlag = flag;
       getWpList({ type: 0 }).then(({ data }) => {
         if (data && data.data.length) {
           this.wpOptions = data.data;
-          this.station = data.data[0].id;
-          this.GetWtOptions();
-          this.getTableData();
+          this.station = flag ? this.route.station : data.data[0].id;
+          if (!flag) {
+            this.getTableData(flag);
+          }
+          this.GetWtOptions(flag);
         } else {
           this.wpOptions = [];
           this.station = "";
         }
       });
     },
-    GetWtOptions() {
+    GetWtOptions(flag) {
       getApiequipmentListByWp({ wpid: this.station }).then(({ data }) => {
         if (data && data.data.length) {
           this.wtOptions = data.data;
+          this.wind = flag ? this.route.wind : "";
+          if (flag) {
+            this.getTableData(1);
+          }
         } else {
           this.wtOptions = [];
           this.wind = "";
         }
       });
     },
-    GetSubOptions() {
+    GetSubOptions(flag) {
       getSubList({ type: 0 }).then(({ data }) => {
         if (data && data.data.length) {
           this.subOptions = data.data;
-          this.sub = this.subOptions[0].id;
+          this.sub = flag ? this.route.station : this.subOptions[0].id;
           this.getTableData();
         } else {
           this.subOptions = [];
@@ -272,10 +285,10 @@ export default {
         }
       });
     },
-    getTableData() {
+    getTableData(flag) {
       this.loading = true;
       let params = {};
-      if (this.alarmType == "windturbine") {
+      if (!flag) {
         params = {
           begin: this.begin,
           end: this.end,
@@ -286,16 +299,28 @@ export default {
           pageNum: this.page.currentPage,
           pageSize: this.page.pagesize,
         };
+        if (this.alarmType != "booststation") {
+          params.deviceid = this.wind;
+        }
       } else {
         params = {
-          begin: this.begin,
-          end: this.end,
-          alarmType: this.alarmType,
-          stationid: this.sub,
+          id: this.route.id,
+          begin: this.route.ts ? this.route.ts : this.begin,
+          end: this.route.endts ? this.route.endts : this.end,
+          alarmType: this.route.alarmType
+            ? this.route.alarmType
+            : this.alarmType,
+          stationid: this.station,
           description: this.description,
           pageNum: this.page.currentPage,
           pageSize: this.page.pagesize,
         };
+        if (this.alarmType != "booststation") {
+          params.deviceid = this.wind;
+          params.stationid = this.station;
+        } else {
+          params.stationid = this.sub;
+        }
       }
       GetTableData(params).then(({ data }) => {
         this.loading = false;
@@ -317,33 +342,65 @@ export default {
     alarmTypeChanged(val) {
       this.alarmType = val;
       this.page.currentPage = 1;
-      if (val == "windturbine") {
-        this.GetWpOptions();
+      if (val != "booststation") {
+        this.GetWpOptions(0);
       } else {
-        this.GetSubOptions();
+        this.GetSubOptions(0);
       }
     },
     subChanged(val) {
       this.sub = val;
       this.page.currentPage = 1;
-      this.getTableData();
+      this.getTableData(0);
     },
     stationChanged(val) {
       this.station = val;
       this.page.currentPage = 1;
-      this.GetWtOptions();
-      this.getTableData();
+      this.GetWtOptions(0);
+      this.getTableData(0);
     },
     windChanged(val) {
       this.wind = val;
       this.page.currentPage = 1;
-      this.getTableData();
+      this.getTableData(0);
     },
     handleCurrentChange(val) {
       this.page.currentPage = val;
+      console.log(this.routeFlag);
       this.getTableData();
     },
   },
+  watch: {
+    $route: {
+      handler(val) {
+        if (val.query && Object.keys(val.query).length) {
+          this.route.id = val.query.id;
+          this.route.station = val.query.stationId;
+          this.route.wind = val.query.deviceId;
+          this.route.ts = dayjs(Number(val.query.ts)).format(
+            "YYYY-MM-DD HH:mm:ss"
+          );
+
+          this.route.endts = val.query.endts
+            ? dayjs(Number(val.query.endts)).format("YYYY-MM-DD HH:mm:ss")
+            : "";
+          this.alarmType = val.query.alarmType;
+          this.begin = this.route.ts;
+          this.end = this.route.endts ? this.route.endts : this.end;
+          if (!val.query.deviceId) {
+            this.GetSubOptions(1);
+          } else {
+            this.GetWpOptions(1);
+          }
+        } else {
+          this.route = { station: "", wind: "", ts: "", endts: "" };
+          this.GetWpOptions(0);
+        }
+      },
+      immediate: true,
+      deep: true,
+    },
+  },
 };
 </script>
 <style scoped lang="less">

src/views/stateMonitor/factoryMonitor/components/headerButton.vue

@@ -170,10 +170,27 @@ export default {
   },
   created() {
     if (!this.byRouter) {
-      this.localWpinfo = JSON.parse(localStorage.getItem("wpInfo"))
-        ? JSON.parse(localStorage.getItem("wpInfo"))
-        : {};
-      this.localCompanyid = localStorage.getItem("companyId");
+      if (this.$route.path.includes("windPowerPlant")) {
+        this.localWpinfo = {
+          wpid: "SXJ_KGDL_BHB3_FDC_STA",
+          wpname: "平鲁败虎堡三期",
+          bootid: "SXJ_KGDL_XWTF01_SBS",
+        };
+        this.localCompanyid = "KGDL_FGS";
+      } else if (this.$route.path.includes("photovoltaic")) {
+        this.localWpinfo = {
+          wpid: "SXJ_KGDL_FS_GDC_STA",
+          wpname: "方山电站",
+          bootid: "SXJ_KGDL_YYG01_SBS",
+        };
+        this.localCompanyid = "KGDL_FGS";
+      }
+    //   localStorage.setItem("companyId", this.localCompanyid);
+    //   localStorage.setItem("wpInfo", JSON.stringify(this.localWpinfo));
+    //   this.localWpinfo = JSON.parse(localStorage.getItem("wpInfo"))
+    //     ? JSON.parse(localStorage.getItem("wpInfo"))
+    //     : {};
+    //   this.localCompanyid = localStorage.getItem("companyId");
       //获取区域公司
       this.$nextTick(() => {
         this.getOrganizationList();

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: {
@@ -718,7 +717,7 @@ export default {
     getBarValuesFDL() {
       GetWpHisdata({ wpid: this.stationCode }).then(({ data }) => {
         let date = data.data.map((item) => item.recordDate);
-        let children = data.data.map((item) => item.rfdl);
+        let children = data.data.map((item) => item.rfdldb);
         this.barList = [
           {
             name: "发电量",
@@ -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;
         }
       });
     },

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

@@ -714,7 +714,7 @@ export default {
     getBarValuesFDL() {
       GetWpHisdata({ wpid: this.stationCode }).then(({ data }) => {
         let date = data.data.map((item) => item.recordDate);
-        let children = data.data.map((item) => item.rfdl);
+        let children = data.data.map((item) => item.rfdldb);
         this.barList = [
           {
             name: "发电量",

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),
         });
       });