更改菜单名称及位置,更改光伏矩阵,保证改为理论,综合分析发电量分析增加利用小时,替换组串逆变器图片

src/api/curveAnalyse.js

@@ -177,3 +177,11 @@ export function gwdlList(data) {
     method: "get",
   });
 }
+//专题分析-利用小时
+export function lyxsList(data) {
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/specific/lyxsList?companys=${data.companys}&type=${data.type}&year=${data.year}`,
+    method: "get",
+  });
+}

src/components/lightDetial/index.vue

@@ -444,7 +444,7 @@ export default {
     margin-right: 10px;
     background: rgba(96, 103, 105, 0.2);
     img {
-      width: 80%;
+      width: 100%;
     }
   }
   .part-info {

src/router/index.js

@@ -544,7 +544,7 @@ export const asyncRoutes = [
       }*/
     ],
   },
-  //   经济运行
+  //经济运行
   {
     path: "/economicsOperation",
     redirect:
@@ -989,33 +989,34 @@ export const asyncRoutes = [
               icon: "",
               permissions: ["jn_gffx_ztsjfx"],
             },
-          },
-          {
-            path: "powerAnalyse",
+            },
+            {
+            path: "powerHotAnalyse",
             component: () =>
               import(
-                "@/views/economicsOperation/photovoltaicAnalyse/powerAnalyse"
+                "@/views/economicsOperation/photovoltaicAnalyse/powerHotAnalyse"
               ),
-            name: "PowerAnalyse",
+            name: "PowerHotAnalyse",
             meta: {
               title: "功率曲线拟合",
               icon: "",
-              permissions: ["jn_gffx_glqxnh"],
+              permissions: ["jn_gffx_glwdfx"],
             },
           },
           {
-            path: "powerHotAnalyse",
+            path: "powerAnalyse",
             component: () =>
               import(
-                "@/views/economicsOperation/photovoltaicAnalyse/powerHotAnalyse"
+                "@/views/economicsOperation/photovoltaicAnalyse/powerAnalyse"
               ),
-            name: "PowerHotAnalyse",
+            name: "PowerAnalyse",
             meta: {
-              title: "功率温度分析",
+              title: "功率曲线查询",
               icon: "",
-              permissions: ["jn_gffx_glwdfx"],
+              permissions: ["jn_gffx_glqxnh"],
             },
           },
+         
           {
             path: "lslfx",
             component: () =>
@@ -1054,7 +1055,8 @@ export const asyncRoutes = [
             },
           },
         ],
-      }, //管控效率
+        },
+      //管控效率
       {
         path: "efficiency",
         redirect: "efficiency/restorationEfficiency",

src/views/economicsOperation/thematicAnalysis/generation/index.vue

@@ -205,6 +205,7 @@ import {
   zhcydlList,
   gwdlList,
   swdlList,
+  lyxsList,
 } from "@/api/curveAnalyse";
 export default {
   name: "curveAnalyse",
@@ -270,6 +271,9 @@ export default {
         {
           name: "综合场用电量",
         },
+        {
+          name: "利用小时",
+        },
       ],
       selectValue: "发电量",
     };
@@ -422,6 +426,32 @@ export default {
             }
           });
           break;
+        case "利用小时":
+          lyxsList({
+            companys: this.company,
+            type: this.tabIndex,
+            year: this.monthChange(this.searchYear),
+          }).then(({ data: res }) => {
+            if (res.data.length) {
+              let arr = [
+                {
+                  wpname: "",
+                  data: {
+                    wpname: "期次",
+                    current: "本期",
+                    sameperiod: "同期",
+                  },
+                },
+              ];
+              this.tableData = [...arr, ...res.data];
+              this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
+            }
+          });
+          break;
       }
     },
     monthChange(data) {

src/views/layout/Menu.vue

@@ -265,7 +265,7 @@ export default {
     },
     fillterMenuRoutes,
     click(index) {
-      this.reFresh = false;
+    //   this.reFresh = false;
       this.activeIndex = index;
       this.subIndex = index + "" + 0;
     },
@@ -345,6 +345,7 @@ export default {
               }
             });
             this.$store.commit("changeMenuData", currData);
+            console.log(currData);
             return currData;
           } else {
             this.$store.commit("changeMenuData", []);
@@ -377,7 +378,7 @@ export default {
     // 监听路由
     $route: {
       handler: function (val, oldVal) {
-        if (this.reFresh) {
+        // if (this.reFresh) {
           this.menuData.some((element, index) => {
             if (val.path.includes(element.id)) {
               this.$nextTick(() => {
@@ -405,8 +406,8 @@ export default {
             this.activeIndex = 0;
             return;
           }
-        }
-        this.reFresh = true;
+        // }
+        // this.reFresh = true;
         const someRes = this.rePagePath.some((path) => {
           return path === val.path;
         });
@@ -531,4 +532,4 @@ export default {
 .icon-fixed {
   padding-bottom: 20px;
 }
-</style>
+</style>

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

@@ -22,6 +22,7 @@
       v-if="tabShow"
       v-model="tab"
       size="mini"
+      style="margin-left: 15px"
       @change="handleTabChanged"
     >
       <el-radio-button label="JZ">集中式</el-radio-button>
@@ -170,27 +171,10 @@ export default {
   },
   created() {
     if (!this.byRouter) {
-      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.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/lightMatrix/index.vue

@@ -554,7 +554,7 @@ export default {
       unpaidList: [
         { text: "光照强度(W/m²)", code: "gzqd" },
         { text: "预测功率(MW)", code: "ycgl" },
-        { text: "保证功率(MW)", code: "bzgl" },
+        { text: "理论功率(MW)", code: "bzgl" },
         // { text: "理论功率(MW)", code: "llgl" },
         { text: "实际功率(MW)", code: "sjgl" },
         // { text: "AGC指令", code: "agc" },

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

@@ -479,8 +479,8 @@ export default {
       unpaidList: [
         { text: "光照强度(W/m²)", code: "speed" },
         { text: "预测功率(MW)", code: "ycgl" },
-        { text: "保证功率(MW)", code: "bzgl" },
-        // { text: "理论功率(MW)", code: "llgl" },
+        // { text: "保证功率(MW)", code: "bzgl" },
+        { text: "理论功率(MW)", code: "llgl" },
         { text: "实际功率(MW)", code: "sjgl" },
         // { text: "AGC指令", code: "agc" },
         // { text: "出线功率(MW)", code: "cxgl" },
@@ -534,19 +534,19 @@ export default {
           cls: "low",
         },
 
-        {
-          text: "保证功率",
-          color: "#9CA5A8",
-          key: "bzgl",
-          ratio: 1000,
-        },
         // {
-        //   text: "理论功率",
+        //   text: "保证功率",
         //   color: "#9CA5A8",
-        //   key: "llgl",
+        //   key: "bzgl",
         //   ratio: 1000,
         // },
         {
+          text: "理论功率",
+          color: "#9CA5A8",
+          key: "llgl",
+          ratio: 1000,
+        },
+        {
           text: "实际功率",
           color: "#9CA5A8",
           key: "sjgl",
@@ -559,17 +559,17 @@ export default {
           stse: "QCAMC",
           sts: "SSPJGZD",
         },
-        {
-          statiomName: "保证功率",
-          stse: "QCAMC",
-          sts: "SSZBZGL",
-        },
         // {
-        //   statiomName: "理论功率",
+        //   statiomName: "保证功率",
         //   stse: "QCAMC",
-        //   sts: "SSZNHGLZS",
+        //   sts: "SSZBZGL",
         // },
         {
+          statiomName: "理论功率",
+          stse: "QCAMC",
+          sts: "SSZNHGLZS",
+        },
+        {
           statiomName: "实际功率",
           stse: "QCAMC",
           sts: "SSZGL",