新增综合厂用电量页面，修改智慧检修健康报告查询参数

src/App.vue

@@ -34,7 +34,7 @@
         @mouseleave="hideMenu"
         v-show="$store.state.menuData.length"
       >
-        <Menu  />
+        <Menu />
       </div>
       <!-- <div>
         <el-menu
@@ -137,7 +137,8 @@ export default {
       return this.$store.state.menuData.length;
     },
   },
-  created() {},
+  created() {
+  },
   mounted() {
     let that = this;
     that.setScale();

src/api/monthlyPerformanceAnalysis.js

@@ -350,7 +350,7 @@ export function getApimaincenterlist(params) {
 export function getMonthElectricAnalyse(params) {
   return request({
     baseURL: process.env.VUE_APP_API,
-    url: `/electricity/statistics?wpId=${params.wpId}&timetype=month`,
+    url: `/electricity/statistics?wpId=${params.wpId}&timetype=month&year=${params.year}`,
     method: "GET",
   });
 }
@@ -358,7 +358,23 @@ export function getMonthElectricAnalyse(params) {
 export function getMonthElectricAnalyseGf(params) {
   return request({
     baseURL: process.env.VUE_APP_API,
-    url: `/electricity/coulometric?wpId=${params.wpId}`,
+    url: `/electricity/coulometric?wpId=${params.wpId}&year=${params.year}`,
+    method: "GET",
+  });
+}
+//查询逆变器电量分析
+export function getOwnDemand(params) {
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/electricity/Comprehensive?wpId=${params.wpId}&year=${params.year}`,
+    method: "GET",
+  });
+}
+//查询逆变器电量分析
+export function getAllStation(params) {
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/electricity/czlist`,
     method: "GET",
   });
 }

src/router/index.js

@@ -978,8 +978,8 @@ export const asyncRoutes = [
         name: "monthElectricAnalyse",
         meta: {
           title: "风电电量分析",
-          icon: "svg-yfdl",
-          permissions: ["jn_glycfx"],
+          icon: "svg-fddl",
+          permissions: ["jn_fddlfx"],
         },
       },
       //光伏电量分析
@@ -990,20 +990,22 @@ export const asyncRoutes = [
         name: "monthElectricAnalyseGf",
         meta: {
           title: "光伏电量分析",
-          icon: "svg-dlfx",
-          permissions: ["jn_glycfx"],
+          icon: "svg-gfdl",
+          permissions: ["jn_gfdlfx"],
         },
       },
       //综合厂用电量
       {
-        path: "ownDemand",
+        path: "monthElectricAnalyseAll",
         component: () =>
-          import("@/views/economicsOperation/ownDemand/index.vue"),
-        name: "ownDemand",
+          import(
+            "@/views/economicsOperation/monthElectricAnalyseAll/index.vue"
+          ),
+        name: "monthElectricAnalyseAll",
         meta: {
           title: "综合厂用电量分析",
-          icon: "svg-dlfx",
-          permissions: ["jn_glycfx"],
+          icon: "svg-cydl",
+          permissions: ["jn_zhcydlfx"],
         },
       },
       //综合管控KPI

src/views/HealthControl/HealthTab1.vue

@@ -180,7 +180,7 @@ export default {
     onClickReport(item) {
       this.$refs.eport.getReport(
         item.wtId,
-        new Date(item.recordDate).formatDate("yyyy-MM-dd")
+        new Date(item.createDate).formatDate("yyyy-MM-dd")
       );
       this.reportshow = true;
     },

src/views/economicsOperation/monthElectricAnalyse/index.vue

@@ -31,6 +31,16 @@
           >
           </el-option>
         </el-select>
+        <el-date-picker
+          size="mini"
+          type="year"
+          v-model="year"
+          value-format="YYYY"
+          placeholder="请选择"
+          style="margin-left: 15px"
+          popper-class="date-select"
+        >
+        </el-date-picker>
         <el-button round size="mini" class="searchColor" @click="getDatas"
           >搜索</el-button
         >
@@ -65,7 +75,11 @@
           >
             <template #default="scope">
               <span>
-                {{ scope.row[index] ? scope.row[index] : "--" }}
+                {{
+                  scope.row[index] || scope.row[index] == 0
+                    ? scope.row[index]
+                    : "--"
+                }}
               </span>
             </template>
           </el-table-column>
@@ -118,7 +132,8 @@ export default {
       companyOptions: [],
       station: "",
       stationOptions: [],
-      selectValue: "功率预测分析",
+      year: "2023",
+      selectValue: "风电电量分析",
       headers: [
         "计划电量",
         "预测电量",
@@ -160,71 +175,73 @@ export default {
     },
     getDatas() {
       this.loading = true;
-      getMonthElectricAnalyse({ wpId: this.station }).then(({ data, code }) => {
-        if (code == 200) {
-          //合计列
-          let hj = [
-            data.bnjhdlhj,
-            data.rfdlychj,
-            data.bnsjdlhj,
-            null,
-            data.qnzbhj + "%",
-            null,
-          ];
-          //处理纵向表格数据
-          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.includes("zb") || key.includes("zql")) {
-                  arr.push(row[key] ? row[key] + "%" : row[key]);
-                } else {
-                  arr.push(row[key]);
+      getMonthElectricAnalyse({ wpId: this.station, year: this.year }).then(
+        ({ data, code }) => {
+          if (code == 200) {
+            //合计列
+            let hj = [
+              data.bnjhdlhj,
+              data.rfdlychj,
+              data.bnsjdlhj,
+              null,
+              data.qnzbhj + "%",
+              null,
+            ];
+            //处理纵向表格数据
+            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.includes("zb") || key.includes("zql")) {
+                    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;
-          });
+              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.rfdlyc),
-              color: "#FF8300",
-            },
-            {
-              name: "实发电量",
-              data: resData.map((ele) => ele.sjdl),
-              color: "#05BB4C",
-            },
-          ];
-          this.list = list;
-          this.loading = false;
+            //处理图表数据
+            let list = [
+              {
+                name: "计划电量",
+                data: resData.map((ele) => ele.jhdl),
+                color: "#4B55AE",
+              },
+              {
+                name: "预测电量",
+                data: resData.map((ele) => ele.rfdlyc),
+                color: "#FF8300",
+              },
+              {
+                name: "实发电量",
+                data: resData.map((ele) => ele.sjdl),
+                color: "#05BB4C",
+              },
+            ];
+            this.list = list;
+            this.loading = false;
+          }
         }
-      });
+      );
     },
   },
 };

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

@@ -64,18 +64,18 @@ export default {
             },
             barWidth: "20%",
           };
-          if (index == 3) {
-            seriesItem = {
-              yAxisIndex: 1,
-              name: listItem?.name,
-              type: "line",
-              smooth: true,
-              data: listItem?.data,
-              itemStyle: {
-                color: listItem.color,
-              },
-            };
-          }
+          //   if (index == 3) {
+          //     seriesItem = {
+          //       yAxisIndex: 1,
+          //       name: listItem?.name,
+          //       type: "line",
+          //       smooth: true,
+          //       data: listItem?.data,
+          //       itemStyle: {
+          //         color: listItem.color,
+          //       },
+          //     };
+          //   }
 
           result.push(seriesItem);
         });
@@ -128,7 +128,7 @@ export default {
         },
         legend: {
           show: true,
-          data: this.list.map((i) => i?.name),
+          data: this.list?.map((i) => i?.name),
           right: 56,
           icon: "ract",
           itemWidth: 8,
@@ -149,7 +149,7 @@ export default {
         xAxis: [
           {
             type: "category",
-            data: this.xdata,
+            data: this?.xdata,
             nameLocation: "center",
             axisPointer: {
               type: "shadow",
@@ -188,24 +188,24 @@ export default {
               },
             },
           },
-          {
-            type: "value",
-            name: "单位：W/m²",
-            nameTextStyle: {
-              color: "#93989A",
-            },
-            splitLine: {
-              show: false,
-            },
-            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,
+        series: this?.series,
       };
       chart.clear();
       chart.setOption(option);

src/views/economicsOperation/ownDemand/index.vue

@@ -4,20 +4,6 @@
       <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"
@@ -31,6 +17,16 @@
           >
           </el-option>
         </el-select>
+        <el-date-picker
+          size="mini"
+          type="year"
+          v-model="year"
+          value-format="YYYY"
+          placeholder="请选择"
+          style="margin-left: 15px"
+          popper-class="date-select"
+        >
+        </el-date-picker>
         <el-button round size="mini" class="searchColor" @click="getDatas"
           >搜索</el-button
         >
@@ -55,25 +51,46 @@
           width="100%"
           height="100%"
         >
+          <el-table-column align="center" label="指标名称" width="120">
+            <template #default="{ row }">
+              {{ row[0] }}
+            </template>
+          </el-table-column>
           <el-table-column
-            v-for="(item, index) in tableHead"
-            :label="item"
+            v-for="(item, index) in tableHead.slice(1, 13)"
+            :label="item.title"
             :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>
+            <el-table-column
+              v-for="(subItem, subIndex) in item.children"
+              :key="subIndex"
+              :label="subItem"
+              align="center"
+              width="45"
+              show-overflow-tooltip
+              ><template #default="scope">
+                <span>
+                  <!-- {{ scope.row[index + 1][subIndex] }} -->
+                  {{
+                    scope.row[index + 1][subIndex] ||
+                    scope.row[index + 1][subIndex] == 0
+                      ? scope.row[index + 1][subIndex]
+                      : "--"
+                  }}
+                </span>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="合计"
+            width="45"
+            show-overflow-tooltip
+          >
+            <template #default="{ row }">
+              {{ row[13] }}
             </template>
           </el-table-column>
         </el-table>
@@ -89,11 +106,14 @@
 
 <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";
+// import { companys } from "@/api/curveAnalyse";
+// import { GetStationByCompany } from "@/api/factoryMonitor/index.js";
+import {
+  getOwnDemand,
+  getAllStation,
+} from "@/api/monthlyPerformanceAnalysis.js";
 export default {
-  name: "monthElectricAnalyseGf",
+  name: "monthElectricAnalyseAll",
   components: {
     // ChartColumnar,
     // Panel,
@@ -106,94 +126,83 @@ export default {
       barList: [],
       tableData: [],
       tableHead: [
-        "指标名称",
-        "一月",
-        "二月",
-        "三月",
-        "四月",
-        "五月",
-        "六月",
-        "七月",
-        "八月",
-        "九月",
-        "十月",
-        "十一月",
-        "十二月",
-        "合计",
+        { title: "指标名称", children: [] },
+        { title: "一月", children: ["本月", "同比", "环比"] },
+        { title: "二月", children: ["本月", "同比", "环比"] },
+        { title: "三月", children: ["本月", "同比", "环比"] },
+        { title: "四月", children: ["本月", "同比", "环比"] },
+        { title: "五月", children: ["本月", "同比", "环比"] },
+        { title: "六月", children: ["本月", "同比", "环比"] },
+        { title: "七月", children: ["本月", "同比", "环比"] },
+        { title: "八月", children: ["本月", "同比", "环比"] },
+        { title: "九月", children: ["本月", "同比", "环比"] },
+        { title: "十月", children: ["本月", "同比", "环比"] },
+        { title: "十一月", children: ["本月", "同比", "环比"] },
+        { title: "十二月", children: ["本月", "同比", "环比"] },
+        { title: "合计", children: [] },
       ],
+
       company: "",
       companyOptions: [],
       station: "",
       stationOptions: [],
-      selectValue: "光伏电量分析",
+      year: "2023",
+      selectValue: "综合厂用电量分析",
       headers: [
-        "日照强度(W/m²)",
-        "实发电量",
-        "计划电量",
-        "计划完成情况(%)",
-        "可研电量",
-        "可研完成情况(%)",
-        "等效发电小时(h)",
+        "综合厂用电量",
+        "发电量",
+        "上网电量",
+        "购网电量",
+        "综合厂用电率(%)",
       ],
     };
   },
   watch: {},
   created() {
-    this.initialization();
+    this.getStation();
   },
   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();
-          }
+      getAllStation().then(({ data: res, code }) => {
+        if (code == 200) {
+          this.stationOptions = res;
+          this.station = this.stationOptions[0].id;
+          this.getDatas();
         }
-      );
+      });
     },
     getDatas() {
       this.loading = true;
-      getMonthElectricAnalyseGf({ wpId: this.station }).then(
+      getOwnDemand({ wpId: this.station, year: this.year }).then(
         ({ data, code }) => {
           if (code == 200) {
             //合计列
             let hj = [
-              data.rzqdhj,
-              data.sjdlhj,
-              data.jhdlhj,
-              data.wcqkhj + "%",
-              data.kydlhj,
-              data.kywcqkhj + "%",
-              data.dxxsshj,
+              data.zhcydlsum,
+              data.sjdlsum,
+              data.swdlsum,
+              data.gwdlsum,
+              data.zhcydllsum + "%",
             ];
             //处理纵向表格数据
             let resData = JSON.parse(JSON.stringify(data.value));
+            let subKey = [
+              ["zhcydl", "zhcydltb", "zhcydlhb"],
+              ["sjdl", "sjdltb", "sjdlhb"],
+              ["swdl", "swdltb", "swdlhb"],
+              ["gwdl", "gwdltb", "gwdlhb"],
+              ["zhcydll", "zhcydlltb", "zhcydllhb"],
+            ];
             // 数组按矩阵思路, 变成转置矩阵
             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]);
-                  }
-                }
+              for (var i = 0; i <= 4; i++) {
+                let subArr = [];
+                subKey[i].forEach((sub) => {
+                  subArr.push(row[sub]);
+                });
+                arr.push(subArr);
               }
               return arr;
             });
@@ -212,12 +221,16 @@ export default {
               ];
               return array;
             });
+            //   .map((item) => {
+            //     item[item.length - 1] = [item[item.length - 1]];
+            //     return item;
+            //   });
 
             //处理图表数据
             let list = [
               {
-                name: "计划电量",
-                data: resData.map((ele) => ele.jhdl),
+                name: "综合厂用电量",
+                data: resData.map((ele) => ele.zhcydl),
                 color: "#4B55AE",
               },
               {
@@ -226,13 +239,13 @@ export default {
                 color: "#05BB4C",
               },
               {
-                name: "可研电量",
-                data: resData.map((ele) => ele.sjdl),
+                name: "上网电量",
+                data: resData.map((ele) => ele.swdl),
                 color: "#21a4f7",
               },
               {
-                name: "日照强度",
-                data: resData.map((ele) => ele.rzqd),
+                name: "购网电量",
+                data: resData.map((ele) => ele.gwdl),
                 color: "#FF8300",
               },
             ];
@@ -332,7 +345,7 @@ export default {
     }
 
     .echarts {
-      height: calc(100% - 310px - 45px);
+      height: calc(100% - 305px - 45px);
       padding: 0 20px;
       .chart-wrapper {
         height: 100%;
@@ -340,7 +353,7 @@ export default {
       }
     }
     .table-wrapper {
-      height: 310px;
+      height: 305px;
       width: 100%;
       padding: 0 20px;
       padding-top: 10px;

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

@@ -238,12 +238,6 @@ export default {
   unmounted() {
     window.removeEventListener("resize", this.resize);
   },
-
-  watch: {
-    "$store.state.themeName"() {
-      this.initChart();
-    },
-  },
 };
 </script>
 

src/views/economicsOperation/monthElectricAnalyseGf/index.vue

@@ -31,6 +31,16 @@
           >
           </el-option>
         </el-select>
+        <el-date-picker
+          size="mini"
+          type="year"
+          v-model="year"
+          value-format="YYYY"
+          placeholder="请选择"
+          style="margin-left: 15px"
+          popper-class="date-select"
+        >
+        </el-date-picker>
         <el-button round size="mini" class="searchColor" @click="getDatas"
           >搜索</el-button
         >
@@ -122,6 +132,7 @@ export default {
       companyOptions: [],
       station: "",
       stationOptions: [],
+      year: "2023",
       selectValue: "光伏电量分析",
       headers: [
         "日照强度(W/m²)",
@@ -165,7 +176,7 @@ export default {
     },
     getDatas() {
       this.loading = true;
-      getMonthElectricAnalyseGf({ wpId: this.station }).then(
+      getMonthElectricAnalyseGf({ wpId: this.station, year: this.year }).then(
         ({ data, code }) => {
           if (code == 200) {
             //合计列

src/views/layout/Menu.vue

@@ -72,20 +72,20 @@
     <ul class="menu-list">
       <li
         class="menu-item"
-        v-for="(menu, index) in subMenu"
-        @click="subclick(index)"
-        :key="index"
-        :class="{ active: subIndex == parentIndex + '' + index }"
+        v-for="(menus, indexs) in subMenu"
+        @click="subclick(indexs)"
+        :key="indexs"
+        :class="{ active: subIndex == parentIndex + '' + indexs }"
       >
-        <router-link :to="menu.path">
+        <router-link :to="menus.path">
           <div class="menu-icon svg-icon">
             <!-- <SvgIcon :svgid="menu.icon"></SvgIcon> -->
           </div>
           <div
             class="sub-menu-text"
-            :class="subIndex == activeIndex + '' + index ? 'green' : 'gray'"
+            :class="subIndex == activeIndex + '' + indexs ? 'green' : 'gray'"
           >
-            {{ menu.text }}
+            {{ menus.text }}
           </div>
         </router-link>
       </li>
@@ -139,6 +139,7 @@ export default {
       subMenu: [],
       subIndex: -1,
       fixed: true,
+      reFresh: true,
     };
   },
   methods: {
@@ -148,8 +149,9 @@ export default {
     },
     fillterMenuRoutes,
     click(index) {
+      this.reFresh = false;
       this.activeIndex = index;
-      this.subIndex = null;
+      this.subIndex = index + "" + 0;
     },
     subMenuShow(children, index) {
       this.isShowSubMenu = true;
@@ -162,6 +164,7 @@ export default {
       this.subMenu = [];
     },
     subclick(index) {
+      this.reFresh = false;
       this.activeIndex = this.parentIndex;
       this.subIndex = this.activeIndex + "" + index;
       this.isShowSubMenu = false;
@@ -256,31 +259,36 @@ export default {
     // 监听路由
     $route: {
       handler: function (val, oldVal) {
-        this.menuData.some((element, index) => {
-          if (val.path.includes(element.id)) {
-            this.$nextTick(() => {
-              this.currRoot = element.id;
+        if (this.reFresh) {
+          this.menuData.some((element, index) => {
+            if (val.path.includes(element.id)) {
               this.$nextTick(() => {
-                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;
-                        }
-                      });
-                  }
+                this.currRoot = element.id;
+                this.$nextTick(() => {
+                  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 true;
+                    }
+                  });
                 });
               });
-            });
-            return true;
-          } else {
+              return true;
+            }
+          });
+          if (val.path.includes("/home")) {
             this.currRoot = "home";
             this.activeIndex = 0;
+            return;
           }
-        });
+        }
+        this.reFresh = true;
       },
       //深度观察监听
       deep: true,