单机性能分析隐藏历史页面，新增综合厂用电量分析页面

src/App.vue

@@ -24,7 +24,7 @@
           >
         </div>
         <div class="header-menu-body">
-          <Header @onMenuClick="HeaderMenuClick" />
+          <Header />
         </div>
       </div>
       <div
@@ -32,14 +32,11 @@
         :class="{ hover: isFixed ? true : isShowMenu }"
         @mouseenter="showMenu"
         @mouseleave="hideMenu"
-        v-show="
-          $store.state.themeName === 'dark' && $store.state.menuData.length
-        "
-        v-if="hideMenus === '0'"
+        v-show="$store.state.menuData.length"
       >
-        <Menu :root="root" />
+        <Menu  />
       </div>
-      <div>
+      <!-- <div>
         <el-menu
           class="lightMenu"
           :class="$store.state.themeName === 'light' ? 'show' : 'hidden'"
@@ -76,7 +73,7 @@
             </el-menu-item-group>
           </el-sub-menu>
         </el-menu>
-      </div>
+      </div> -->
       <div
         class="main-body"
         :style="{ paddingLeft: isFixed && menuLength > 0 ? '52px' : 0 }"
@@ -200,12 +197,6 @@ export default {
     },
     login() {
       this.$store.commit("user/SET_LOGINSTATE", true);
-
-      // websocket启动
-      //   this.createWebSocket();
-    },
-    selectMenu(menuIndex) {
-      this.menuIndex = menuIndex;
     },
   },
 
@@ -220,9 +211,6 @@ export default {
           this.socketLeaveFlag = true;
           // 关闭WebSocket
           this.socketObj.close();
-        } else {
-          this.getBooster();
-          this.getCftlist();
         }
         if (res) {
           this.getBooster();

src/api/monthlyPerformanceAnalysis.js

@@ -83,9 +83,6 @@ export function getApihistorywindturbinegoodnesslist(params) {
     baseURL: process.env.VUE_APP_API,
     url: "/goodness/goodhistorylist",
     method: "POST",
-    headers: {
-      "content-type": "application/x-www-form-urlencoded", // FormData格式传参
-    },
     params,
   });
 }

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

@@ -58,7 +58,6 @@ export default {
   methods: {
     resize() {},
     initChart(value, index) {
-      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;
@@ -305,7 +304,6 @@ export default {
       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) => {

src/router/index.js

@@ -970,14 +970,14 @@ export const asyncRoutes = [
           },
         ],
       },
-      //功率预测分析
+      //风电电量分析
       {
         path: "monthElectricAnalyse",
         component: () =>
           import("@/views/economicsOperation/monthElectricAnalyse/index.vue"),
         name: "monthElectricAnalyse",
         meta: {
-          title: "功率预测分析",
+          title: "风电电量分析",
           icon: "svg-yfdl",
           permissions: ["jn_glycfx"],
         },
@@ -994,6 +994,18 @@ export const asyncRoutes = [
           permissions: ["jn_glycfx"],
         },
       },
+      //综合厂用电量
+      {
+        path: "ownDemand",
+        component: () =>
+          import("@/views/economicsOperation/ownDemand/index.vue"),
+        name: "ownDemand",
+        meta: {
+          title: "综合厂用电量分析",
+          icon: "svg-dlfx",
+          permissions: ["jn_glycfx"],
+        },
+      },
       //综合管控KPI
       {
         path: "comprehensiveControl",

src/views/Home/components/map.vue

@@ -1939,7 +1939,6 @@ export default {
             };
           });
           this.CurveValues = Powertrend.value;
-          console.log(this.CurveValues);
         }
       });
     },

src/views/Home/components/power-review-home.vue

@@ -118,10 +118,7 @@ export default {
           //   dialogType,
           data: data.map((item) => {
             return {
-              dateTime: dayjs()
-                .startOf("date")
-                .add(item.hours, "hour")
-                .format("MM-DD HH:mm"),
+              dateTime: dayjs(item.time).format("MM-DD HH:mm"),
               value: item[obj.code],
             };
           }),

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

@@ -225,7 +225,7 @@ export default {
     async init(row) {
       //   this.hiscompanyVal = row.companyId;
       this.hisstationVal = row.windtpowerstationId;
-      this.hiswindVal = row.windturbineId || row.wtid;
+      this.hiswindVal = row.windturbineId;
       await this.getTableData();
     },
     dateTimeFn(row) {

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

@@ -83,6 +83,7 @@
             prop="wtcode"
             :label="tabIndex == -1 ? '风机' : '逆变器'"
             show-overflow-tooltip
+            width="80"
             sortable
           >
             <template #default="scope">
@@ -103,7 +104,7 @@
             :label="item.title"
             show-overflow-tooltip
             align="center"
-            :width="item.title === '操作' ? '80' : '160'"
+        
           >
             <!-- <template #header="scope">
               <div v-if="scope.column.label.indexOf('(') > 0">
@@ -120,10 +121,13 @@
               </div>
               <div v-else>{{ scope.column.label }}</div>
             </template> -->
-            <template #default="scope" v-if="item.title === '操作'">
+            <!-- <template #default="scope" v-if="item.title === '操作'">
               <span class="historyBtn" @click="seachHistoryData(scope.row)"
                 >历史</span
               >
+            </template> -->
+            <template #default="scope">
+              <span>{{ scope.row[item.code] }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -142,7 +146,6 @@
       width="100%"
       custom-class="windhistoryDetailModel"
       destroy-on-close
-      :close-on-click-modal="false"
       fullscreen
     >
       <template #title>
@@ -163,7 +166,6 @@
       v-model="dialogDetail"
       width="100%"
       custom-class="windDetailmodal"
-      :close-on-click-modal="false"
       fullscreen
       destroy-on-close
     >
@@ -226,7 +228,7 @@ export default {
         { title: "年排行榜", code: "yearTop" },
         { title: "年拟合优度(%)", code: "yearGoodness" },
         { title: "年风速(m/s)", code: "yearSpeed" },
-        { title: "操作" },
+        // { title: "操作" },
       ],
       tableHeaderGf: [
         { title: "逆变器", code: "wtname" },
@@ -253,23 +255,10 @@ export default {
     };
   },
   created() {
-    const clientHeight =
-      document.documentElement.clientHeight || document.body.clientHeight;
-    if (clientHeight === 1080) {
-      this.isFullScreen = true;
-    } else {
-      this.isFullScreen = false;
-    }
+    this.pickerTimer = dayjs().add(-1, "day").format("YYYY-MM-DD");
     this.getCompanyData();
   },
-  mounted() {
-    window.onresize = () => {
-      const clientHeight =
-        document.documentElement.clientHeight || document.body.clientHeight;
-      this.isFullScreen = window.screen.height == clientHeight;
-      this.getTableData();
-    };
-  },
+  mounted() {},
   computed: {
     pageHeight() {
       return {
@@ -286,10 +275,6 @@ export default {
     // 获取公司列表
     async getCompanyData() {
       this.companyOptions = [];
-      this.pickerTimer = dayjs(new Date().getTime() - 86400000).format(
-        "YYYY-MM-DD"
-      );
-      //   this.pickerTimer = "2023-8-29";
       const { data: datas } = await getApicompanyslist();
       this.companyOptions = datas.data;
       this.companyVal = datas.data[0]?.id;
@@ -379,12 +364,10 @@ export default {
       this.dialogVisible = true;
       this.dialogTitle = "历史数据查询";
       this.$nextTick(() => {
-        let startT =
-          new Date(this.pickerTimer).getTime() - 10 * 24 * 60 * 60 * 1000;
-        this.$refs.windhistoryDetail.pickerTimer = [
-          this.getchangeTime(new Date(startT)),
-          this.pickerTimer,
-        ];
+        let startT = dayjs(this.pickerTimer)
+          .add(-10, "day")
+          .format("YYYY-MM-DD");
+        this.$refs.windhistoryDetail.pickerTimer = [startT, this.pickerTimer];
         if (this.tabIndex == -1) {
           this.$refs.windhistoryDetail.init(row);
         } else {

src/views/economicsOperation/monthElectricAnalyseGf/index.vue

@@ -124,12 +124,12 @@ export default {
       stationOptions: [],
       selectValue: "光伏电量分析",
       headers: [
-        "计划电量",
+        "日照强度(W/m²)",
         "实发电量",
+        "计划电量",
+        "计划完成情况(%)",
         "可研电量",
-        "完成情况(%)",
         "可研完成情况(%)",
-        "日照强度(W/m²)",
         "等效发电小时(h)",
       ],
     };
@@ -170,12 +170,12 @@ export default {
           if (code == 200) {
             //合计列
             let hj = [
-              data.jhdlhj,
+              data.rzqdhj,
               data.sjdlhj,
-              data.kydlhj,
+              data.jhdlhj,
               data.wcqkhj + "%",
+              data.kydlhj,
               data.kywcqkhj + "%",
-              data.rzqdhj,
               data.dxxsshj,
             ];
             //处理纵向表格数据

src/views/economicsOperation/ownDemand/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/ownDemand/index.vue

@@ -0,0 +1,350 @@
+<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
+          >
+            <!-- <el-table-column label="同比"></el-table-column>
+            <el-table-column label="环比"></el-table-column>
+            <el-table-column label="本月"></el-table-column> -->
+            <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.rzqdhj,
+              data.sjdlhj,
+              data.jhdlhj,
+              data.wcqkhj + "%",
+              data.kydlhj,
+              data.kywcqkhj + "%",
+              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

@@ -133,9 +133,11 @@
         <div style="text-align: right">
           <el-pagination
             @current-change="handlePageChange"
+            @size-change="handleSizeChange"
             :current-page="page.currentPage"
             :page-size="page.pagesize"
-            layout="total, prev, pager, next, jumper"
+            :page-sizes="[22, 50, 100, 500]"
+            layout="total, sizes, prev, pager, next, jumper"
             :total="page.total"
           >
           </el-pagination>
@@ -209,6 +211,11 @@ export default {
       this.page.currentPage = val;
       this.seachData();
     },
+    handleSizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pagesize = val;
+      this.seachData();
+    },
     // 切换tab
     tabSelect(index) {
       this.tabIndex = index;

src/views/layout/Header.vue

@@ -146,24 +146,24 @@ export default {
   },
   components: { SvgIcon },
   mounted() {
-    let that = this;
-    $(document).keydown((event) => {
-      if (event.keyCode == 192) {
-        // c
-        // let firstDate = new Date();
-        // if (that.firsttime == 0) {
-        //   that.firsttime = firstDate.getTime();
-        // } else {
-        //   var lastDate = new Date();
-        //   var lastTime = lastDate.getTime();
-        //   if (lastTime - that.firsttime < 1000) {
-        //     that.changeTheme();
-        //     that.firsttime = 0;
-        //   }
-        // }
-        that.changeTheme();
-      }
-    });
+    // let that = this;
+    // $(document).keydown((event) => {
+    //   if (event.keyCode == 192) {
+    //     // c
+    //     // let firstDate = new Date();
+    //     // if (that.firsttime == 0) {
+    //     //   that.firsttime = firstDate.getTime();
+    //     // } else {
+    //     //   var lastDate = new Date();
+    //     //   var lastTime = lastDate.getTime();
+    //     //   if (lastTime - that.firsttime < 1000) {
+    //     //     that.changeTheme();
+    //     //     that.firsttime = 0;
+    //     //   }
+    //     // }
+    //     that.changeTheme();
+    //   }
+    // });
   },
   computed: {
     userName() {
@@ -191,6 +191,11 @@ export default {
           text: "综合报警",
           path: "",
         });
+        currMenu.splice(5, 0, {
+          id: "fdfx",
+          text: "发电能力分析",
+          path: "",
+        });
         // currMenu.push();
         return currMenu;
       } else {
@@ -211,6 +216,17 @@ export default {
         )}&jiami=${jiami}`;
         window.open(url);
         return;
+      } else if (data.id === "fdfx") {
+        let jiami = encrypt(getCookie("jiami")).replace(/\+/g, " ");
+
+        // let url = `http://192.168.1.117:3002/#/check?username=${getCookie(
+        //   "username"
+        // )}&jiami=${jiami}`;
+        let url = `http://10.81.3.155:8083/dlfx/#/check?username=${getCookie(
+          "username"
+        )}&jiami=${jiami}`;
+        window.open(url);
+        return;
       }
       this.activeIndex = index;
       this.$router.push(data.path);
@@ -264,7 +280,7 @@ export default {
             if (val.path.includes(t.id)) {
               this.activeIndex = index;
               const ActiveModule = this.currMenu.find((ele) => {
-                return ele.path === val.path;
+                return ele.path === t.path;
               });
               if (ActiveModule) {
                 this.$store.dispatch("changeModuleName", ActiveModule.text);

src/views/layout/Menu.vue

@@ -1,15 +1,36 @@
 <template>
-  <div class="menu" v-if="currentMenu.length">
+  <div class="menu">
     <ul class="menu-list">
       <li
         class="menu-item"
-        v-for="(menu, index) of currentMenu"
-        :key="menu"
+        v-for="(menu, index) in currentMenu"
+        :key="index"
         @click="click(index)"
         :class="{ active: activeIndex == index }"
-        @mouseenter="subMenuShow(menu.children, index, menu.showChild)"
       >
-        <router-link v-if="!menu.showChild || !menu.children" :to="menu.path">
+        <router-link
+          :to="menu.path"
+          v-if="menu.children"
+          @mouseenter="subMenuShow(menu.children, index)"
+        >
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="menu.text"
+            placement="bottom"
+            :show-after="500"
+            :enterable="false"
+            hide-after="10"
+          >
+            <div
+              class="menu-icon svg-icon"
+              :class="activeIndex == index ? 'svg-icon-green' : 'svg-icon-gray'"
+            >
+              <SvgIcon :svgid="menu.icon"></SvgIcon>
+            </div>
+          </el-tooltip>
+        </router-link>
+        <router-link :to="menu.path" v-else>
           <el-tooltip
             class="item"
             effect="dark"
@@ -27,7 +48,7 @@
             </div>
           </el-tooltip>
         </router-link>
-        <el-tooltip
+        <!-- <el-tooltip
           v-else
           class="item"
           effect="dark"
@@ -43,29 +64,18 @@
           >
             <SvgIcon :svgid="menu.icon"></SvgIcon>
           </div>
-        </el-tooltip>
-        <!-- <div v-if="menu.children" class="sub-menu-item">
-          <div class="menu-icon svg-icon" :class="activeIndex == index ? 'svg-icon-green' : 'svg-icon-gray'">
-            <SvgIcon :svgid="menu.icon"></SvgIcon>
-          </div>
-        </div> -->
+        </el-tooltip> -->
       </li>
     </ul>
   </div>
-  <div
-    class="sub-menu"
-    v-show="isShowSubMenu"
-    @mouseleave="subMenuHide"
-    v-if="$store.state.themeName === 'dark'"
-  >
+  <div class="sub-menu" v-show="isShowSubMenu" @mouseleave="subMenuHide">
     <ul class="menu-list">
       <li
-        v-show="!menu.path.includes('decision1Mx')"
         class="menu-item"
-        v-for="(menu, index) of subMenu"
+        v-for="(menu, index) in subMenu"
         @click="subclick(index)"
-        :key="menu"
-        :class="{ active: subIndex == index }"
+        :key="index"
+        :class="{ active: subIndex == parentIndex + '' + index }"
       >
         <router-link :to="menu.path">
           <div class="menu-icon svg-icon">
@@ -73,7 +83,7 @@
           </div>
           <div
             class="sub-menu-text"
-            :class="subIndex == index ? 'green' : 'gray'"
+            :class="subIndex == activeIndex + '' + index ? 'green' : 'gray'"
           >
             {{ menu.text }}
           </div>
@@ -125,9 +135,9 @@ export default {
       ],
       activeIndex: 0,
       isShowSubMenu: false,
-      parentIndex: null,
+      parentIndex: -1,
       subMenu: [],
-      subIndex: null,
+      subIndex: -1,
       fixed: true,
     };
   },
@@ -141,64 +151,45 @@ export default {
       this.activeIndex = index;
       this.subIndex = null;
     },
-    subMenuShow(children, index, flag) {
-      if (flag != undefined && !flag) {
-        this.isShowSubMenu = false;
-        this.parentIndex = index;
-        this.subMenu = children;
-      } else {
-        if (children) {
-          this.isShowSubMenu = true;
-          this.parentIndex = index;
-        } else {
-          this.isShowSubMenu = false;
-          this.parentIndex = null;
-        }
-        this.subMenu = children;
-      }
+    subMenuShow(children, index) {
+      this.isShowSubMenu = true;
+      this.parentIndex = index;
+      this.subMenu = children;
     },
     subMenuHide() {
       this.isShowSubMenu = false;
-      this.parentIndex = null;
-      // this.subMenu = [];
+      this.parentIndex = -1;
+      this.subMenu = [];
     },
     subclick(index) {
       this.activeIndex = this.parentIndex;
-      this.subIndex = index;
+      this.subIndex = this.activeIndex + "" + index;
+      this.isShowSubMenu = false;
     },
   },
 
   computed: {
     currentMenu() {
-      let stateRoutes = this.$store.state.routes.routes;
+      let stateRoutes = JSON.parse(
+        JSON.stringify(this.$store.state.routes.routes)
+      );
 
       if (stateRoutes.length) {
-        let routeObj = this.$store.state.routes.routes.find(
-          (i) => i.path == "/" + this.currRoot
-        );
+        let routeObj = stateRoutes.find((i) => i.path == "/" + this.currRoot);
         let currData = [];
-        if (Object.keys(routeObj).length) {
+        if (routeObj && Object.keys(routeObj).length) {
           let a = JSON.parse(JSON.stringify(routeObj));
           if (a.children) {
             a.children.forEach((path) => {
               if (!path.hidden) {
-                if (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: [],
-                    });
-                  }
+                if (path.showChild != true && path.children) {
+                  currData.push({
+                    text: path.meta.title,
+                    icon: path.meta.icon,
+                    fullPath: path.path,
+                    path: `/${this.currRoot}/${path.path}`,
+                    children: [],
+                  });
 
                   let cu = currData.find((i) => i.text == path.meta.title);
                   path.children.forEach((cputh) => {
@@ -208,38 +199,42 @@ export default {
                         0,
                         cputh.path.indexOf("/:")
                       )}/SXJ_KGDL_GJY_FDC_STA/SXJ_KGDL_GJY_F_WT_0001_EQ`;
+                    } else if (cputh.path == "decision1Mx") {
+                      caputh = "";
                     } else {
                       caputh = cputh.path;
                     }
-                    cu["children"].push({
-                      text: cputh.meta.title,
-                      icon: cputh.meta.icon,
-                      path: `/${this.currRoot}/${path.path}/${caputh}`,
-                    });
+                    if (caputh.length) {
+                      cu["children"].push({
+                        text: cputh.meta.title,
+                        icon: cputh.meta.icon,
+                        path: `/${this.currRoot}/${path.path}/${caputh}`,
+                      });
+                    }
                   });
                   cu.path = cu.children[0].path;
                 } else {
                   currData.push({
                     text: path.meta.title,
                     icon: path.meta.icon,
+                    fullPath: path.path,
                     path: `/${this.currRoot}/${path.path}`,
                   });
                 }
               }
             });
-
-            this.$store.dispatch("changeMenuData", currData);
+            this.$store.commit("changeMenuData", currData);
             return currData;
           } else {
-            this.$store.dispatch("changeMenuData", []);
+            this.$store.commit("changeMenuData", []);
             return [];
           }
         } else {
-          this.$store.dispatch("changeMenuData", []);
+          this.$store.commit("changeMenuData", []);
           return [];
         }
       } else {
-        this.$store.dispatch("changeMenuData", []);
+        this.$store.commit("changeMenuData", []);
         return [];
       }
     },
@@ -266,9 +261,16 @@ export default {
             this.$nextTick(() => {
               this.currRoot = element.id;
               this.$nextTick(() => {
-                this.currentMenu.some((element, index) => {
-                  if (val.path == element.path) {
+                this.currentMenu.forEach((element, index) => {
+                  if (val.path.includes(element.fullPath)) {
                     this.activeIndex = index;
+                    element.children &&
+                      element.children.forEach((i, inx) => {
+                        if (val.path == i.path) {
+                          this.subIndex = index + "" + inx;
+                          return;
+                        }
+                      });
                   }
                 });
               });

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

@@ -6,15 +6,14 @@
 </template>
 
 <script>
-import saliderBar from "../components/saliderBar";
+import saliderBar from "@/views/stateMonitor/factoryMonitor/components/saliderBar";
 export default {
   name: "photovoltaic", //光伏场站
   components: {
     saliderBar,
   },
   data() {
-    return {
-    };
+    return {};
   },
   methods: {},
   computed: {

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

@@ -138,7 +138,7 @@
   </el-drawer>
 </template>
 <script>
-import headerButton from "../../components/headerButton.vue";
+import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerButton.vue";
 import GFshanyinrongxin from "./components/shanyinrongxin.vue";
 import GFfangshansunjiashan from "./components/fangshansunjiashan.vue";
 import GFfanshijunran from "./components/fanshijunran.vue";

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

@@ -591,7 +591,7 @@ ul li {
       color: #b3b3b3;
       font-size: 14px;
       cursor: pointer;
-      background: url("../../../../../assets/imgs/buttonBack.png") no-repeat;
+      background: url("~@/assets/imgs/buttonBack.png") no-repeat;
       background-size: cover;
 
       i {

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

@@ -89,7 +89,7 @@
   </div>
 </template>
 <script>
-import headerButton from "../../components/headerButton.vue";
+import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerButton.vue";
 import syMap from "./components/sy-map.vue";
 import syMap2 from "./components/sy2-map.vue";
 import fsMap from "./components/fs-map.vue";

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])?.toFixed(2)
+                    : singleMatrixInfo[item.code]?.toFixed(2)
                   : "0.00"
               }}
             </div>

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

@@ -105,7 +105,7 @@
 <script>
 import zbDialog from "@/components/zbDialog/index.vue";
 import dialogCheck from "@/components/qushi/dialogCheck.vue";
-import headerButton from "../../components/headerButton";
+import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerButton.vue";
 import { GetWtTargetsList } from "@/api/factoryMonitor/index.js";
 import { getNewObj, deepClone } from "@/utills/func.js";
 
@@ -587,7 +587,7 @@ ul li {
       color: #b3b3b3;
       font-size: 14px;
       cursor: pointer;
-      background: url("../../../../../assets/imgs/buttonBack.png") no-repeat;
+      background: url("~@/assets/imgs/buttonBack.png") no-repeat;
       background-size: cover;
 
       i {

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

@@ -115,7 +115,7 @@
   </el-drawer>
 </template>
 <script>
-import headerButton from "../../components/headerButton.vue";
+import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerButton.vue";
 // import sbsAlarm from "@/components/sbsAlarm/index.vue";
 import { ElMessageBox } from "element-plus";
 // 风场

src/views/stateMonitor/factoryMonitor/windPowerPlant/components/iframeCom.vue

@@ -71,7 +71,7 @@
 </template>
 <script>
 import tuDialog from "../../components/tuDialog";
-import headerButton from "../../components/headerButton";
+import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerButton.vue";
 // import {GetMapUrlAddressByStationCode} from "@api/boosterStation";
 // import {GetCompanyDataTagList} from '@/api/synthesizeTargetSystem';
 // import {GetTagInfoByTagName} from "../../../../../../api/boosterStation";

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

@@ -18,7 +18,7 @@
   </div>
 </template>
 <script>
-import headerButton from "../../components/headerButton";
+import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerButton.vue";
 import { GetWtlistTree } from "@/api/factoryMonitor/index.js";
 import windDetail from "@/components/windDetail/index";
 import collapseList from "../components/collapse-list.vue";

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

@@ -121,7 +121,7 @@
   </div>
 </template>
 <script>
-import headerButton from "../../components/headerButton.vue";
+import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerButton.vue";
 import gjyMap from "./components/gjy-map.vue";
 import gjyMap2 from "./components/gjy-map2.vue";
 import hsmMap from "./components/hsm-map.vue";

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

@@ -295,7 +295,7 @@
 
 <script>
 import qushiDialog from "@/components/qushi/qushiDialog.vue";
-import headerButton from "../../components/headerButton";
+import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerButton.vue";
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
 import windDetail from "@/components/windDetail/index";
 import api from "@/api/cockpit/matrix/index.js";

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

@@ -68,11 +68,7 @@
         <img width="60" height="60" src="@assets/imgs/3.png" class="zhuan" />
       </div>
       <div class="target">
-        <power-review-home
-          :data="powerDataHome"
-          type="-1"
-        />
-     
+        <power-review-home :data="powerDataHome" type="-1" />
       </div>
       <div class="temp">
         <thermometer :s="towerInfo?.wd" title="温度" unit="℃" />
@@ -225,7 +221,7 @@ export default {
       dialogShow: false,
       showName: "24小时功率曲线",
       showCharts: {},
-      powerDataHome:{}
+      powerDataHome: {},
     };
   },
   computed: {
@@ -295,21 +291,21 @@ export default {
       GetTowerinfoById({ weatherid: id }).then(({ data }) => {
         this.towerInfo = data.data;
         this.powerDataHome = [
-            {
-              title: "空气密度",
-              value: this.towerInfo.kqmd.toFixed(2),
-              dialogTitle: "空气密度",
-              max: 3000,
-              unit: "kg/m³",
-            },
-            {
-              title: "压强",
-              value: this.towerInfo.yq.toFixed(2),
-              dialogTitle: "压强",
-              max: 3000,
-              unit: "Pa",
-            },
-          ];
+          {
+            title: "空气密度",
+            value: this.towerInfo.kqmd.toFixed(2),
+            dialogTitle: "空气密度",
+            max: 3000,
+            unit: "kg/m³",
+          },
+          {
+            title: "压强",
+            value: this.towerInfo.yq.toFixed(2),
+            dialogTitle: "压强",
+            max: 3000,
+            unit: "Pa",
+          },
+        ];
       });
     },
     towerChanged(id) {

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

@@ -110,10 +110,7 @@
           </div>
           <div class="base-info-right">
             <div class="target">
-              <power-review-home
-                :data="powerDataHome"
-                type="-1"
-              />
+              <power-review-home :data="powerDataHome" type="-1" />
             </div>
             <div class="info-block">
               <div
@@ -246,7 +243,7 @@
 </template>
 
 <script>
-import headerButton from "../../components/headerButton";
+import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerButton.vue";
 import powerReviewHome from "@/views/stateMonitor/factoryMonitor/components/power-review-home.vue";
 import powerEcharts from "@/components/chart/powerEcharts.vue";
 import PieChart from "../components/pieChart.vue";
@@ -1474,8 +1471,7 @@ export default {
           position: relative;
           width: 84px;
           height: 84px;
-          background: url("../../../../../assets/imgs/instrumentPanel.png")
-            no-repeat;
+          background: url("~@/assets/imgs/instrumentPanel.png") no-repeat;
           display: flex;
           flex-direction: row;
           align-items: center;