新增风电新能源报表、修改风电场站和光伏场站展示字段

.env.development

@@ -1,10 +1,10 @@
 # VUE_APP_API=http://10.81.3.155:8020
-VUE_APP_API=http://192.168.1.104:6060
-# VUE_APP_API=http://10.81.3.153:6060
+# VUE_APP_API=http://192.168.1.105:6060
+VUE_APP_API=http://10.81.3.153:6060
 
 # 经济运行 安全监视 
-VUE_APP_Matrix=http://192.168.1.104:6060
-# VUE_APP_Matrix=http://10.81.3.153:6060
+# VUE_APP_Matrix=http://192.168.1.105:6060
+VUE_APP_Matrix=http://10.81.3.153:6060
 
 
 VUE_APP_ADAPTERURL=http://10.81.3.155:8011

src/components/qushi/qushiDialog.vue

@@ -492,7 +492,12 @@ export default {
     exportDatas() {
       let tableHeader = this.tableHeader.map((item) => item.title);
       let tableKey = this.tableHeader.map((item) => item.code);
-      outExportExcel(tableHeader,tableKey,this.detailsValue,'对比曲线导出数据');
+      outExportExcel(
+        tableHeader,
+        tableKey,
+        this.detailsValue,
+        "对比曲线导出数据"
+      );
     },
     c() {
       this.dialogFull ? (this.dialogFull = false) : (this.dialogFull = true);
@@ -721,8 +726,9 @@ export default {
                   vals.push(value[j].pointValueInDouble);
                 }
               }
-              let maxValue = vals.sort()[0].toFixed(2);
-              let minValue = vals.sort().reverse()[0].toFixed(2);
+
+              let maxValue = vals.sort((i, j) => i - j).reverse()[0].toFixed(2);
+              let minValue = vals.sort((i, j) => i - j)[0].toFixed(2);
               let totalValue = 0;
               for (var k = 0; k < vals.length; k++) {
                 totalValue += vals[k];
@@ -761,7 +767,10 @@ export default {
         }
       });
     },
-
+    sortFun(a, b) {
+      console.log(a, b, Number.parseInt(a - b));
+      return parseInt(a) - parseInt(b);
+    },
     // 点击查询按钮查询对比曲线
     searchChartData() {
       this.searchFlag = true;

src/router/index.js

@@ -402,19 +402,19 @@ export const asyncRoutes = [
               permissions: ["jn_dbgl_wxssl", "*:*:*"],
             },
           },
-        //   {
-        //     path: "companyBenchmarking",
-        //     component: () =>
-        //       import(
-        //         "@/views/economicsOperation/benchmarkingManagement/companyBenchmarking"
-        //       ),
-        //     name: "companyBenchmarking",
-        //     meta: {
-        //       title: "公司对标",
-        //       icon: "",
-        //       permissions: ["jn_dbgl_gsdb", "*:*:*"],
-        //     },
-        //   },
+          //   {
+          //     path: "companyBenchmarking",
+          //     component: () =>
+          //       import(
+          //         "@/views/economicsOperation/benchmarkingManagement/companyBenchmarking"
+          //       ),
+          //     name: "companyBenchmarking",
+          //     meta: {
+          //       title: "公司对标",
+          //       icon: "",
+          //       permissions: ["jn_dbgl_gsdb", "*:*:*"],
+          //     },
+          //   },
           {
             path: "siteBenchmarking",
             component: () =>
@@ -1076,6 +1076,26 @@ export const asyncRoutes = [
             },
           },
           {
+            path: "fdxnyrb",
+            name: "fdxnyrb",
+            component: () => import("@/views/report/stationReport/fdxnyrb"),
+            meta: {
+              title: "晋能风电新能源日报",
+              icon: "",
+              permissions: ["jn_zdz_fdxnyrb", "*:*:*"],
+            },
+          },
+          {
+            path: "gfxnyrb",
+            name: "gfxnyrb",
+            component: () => import("@/views/report/stationReport/gfxnyrb"),
+            meta: {
+              title: "晋能光伏新能源日报",
+              icon: "",
+              permissions: ["jn_zdz_gfxnyrb", "*:*:*"],
+            },
+          },
+          {
             path: "fdczzdy",
             name: "fdczzdy",
             component: () => import("@/views/report/stationReport/fdczzdy"),

src/views/report/stationReport/fdxnyrb/index.vue

@@ -0,0 +1,33 @@
+<template>
+  <div style="height: 100%">
+    <iframe
+      :src="url"
+      width="100%"
+      height="100%"
+      frameborder="0"
+      scrolling="auto"
+    ></iframe>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      url: "http://10.81.3.155:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$cf794177cf764f258f8105c6d3b03f3c$fe0158e8338649feac0e326451439e55&id=admin&pw=admin",
+    };
+  },
+};
+</script>
+<style lang="less" scope>
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+.knowledge-2 {
+  .el-select {
+    width: 200px;
+  }
+  .el-input {
+    width: 200px;
+  }
+}
+</style>

src/views/report/stationReport/gfxnyrb/index.vue

@@ -0,0 +1,33 @@
+<template>
+  <div style="height: 100%">
+    <iframe
+      :src="url"
+      width="100%"
+      height="100%"
+      frameborder="0"
+      scrolling="auto"
+    ></iframe>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      url: "http://10.81.3.155:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$cf794177cf764f258f8105c6d3b03f3c$fe0158e8338649feac0e326451439e55&id=admin&pw=admin",
+    };
+  },
+};
+</script>
+<style lang="less" scope>
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+.knowledge-2 {
+  .el-select {
+    width: 200px;
+  }
+  .el-input {
+    width: 200px;
+  }
+}
+</style>

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

@@ -531,31 +531,31 @@ export default {
           code: "jrts",
           name: "接入台数",
         },
-        {
-          code: "jrrl",
-          name: "接入容量(MW)",
-          unit: 1000,
-        },
-        {
-          code: "hzrl",
-          name: "核准容量(MW)",
-          unit: 1000,
-        },
-        {
-          code: "zjrl",
-          name: "在建容量(MW)",
-          unit: 1000,
-        },
-        {
-          code: "bwrl",
-          name: "并网容量(MW)",
-          unit: 1000,
-        },
-        {
-          code: "dzrl",
-          name: "吊装容量(MW)",
-          unit: 1000,
-        },
+        // {
+        //   code: "jrrl",
+        //   name: "接入容量(MW)",
+        //   unit: 1000,
+        // },
+        // {
+        //   code: "hzrl",
+        //   name: "核准容量(MW)",
+        //   unit: 1000,
+        // },
+        // {
+        //   code: "zjrl",
+        //   name: "在建容量(MW)",
+        //   unit: 1000,
+        // },
+        // {
+        //   code: "bwrl",
+        //   name: "并网容量(MW)",
+        //   unit: 1000,
+        // },
+        // {
+        //   code: "dzrl",
+        //   name: "吊装容量(MW)",
+        //   unit: 1000,
+        // },
         {
           code: "zzjrl",
           name: "装机容量(MW)",

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

@@ -536,31 +536,31 @@ export default {
           code: "jrts",
           name: "接入台数",
         },
-        {
-          code: "jrrl",
-          name: "接入容量(MW)",
-          unit: 1000,
-        },
-        {
-          code: "hzrl",
-          name: "核准容量(MW)",
-          unit: 1000,
-        },
-        {
-          code: "zjrl",
-          name: "在建容量(MW)",
-          unit: 1000,
-        },
-        {
-          code: "bwrl",
-          name: "并网容量(MW)",
-          unit: 1000,
-        },
-        {
-          code: "dzrl",
-          name: "吊装容量(MW)",
-          unit: 1000,
-        },
+        // {
+        //   code: "jrrl",
+        //   name: "接入容量(MW)",
+        //   unit: 1000,
+        // },
+        // {
+        //   code: "hzrl",
+        //   name: "核准容量(MW)",
+        //   unit: 1000,
+        // },
+        // {
+        //   code: "zjrl",
+        //   name: "在建容量(MW)",
+        //   unit: 1000,
+        // },
+        // {
+        //   code: "bwrl",
+        //   name: "并网容量(MW)",
+        //   unit: 1000,
+        // },
+        // {
+        //   code: "dzrl",
+        //   name: "吊装容量(MW)",
+        //   unit: 1000,
+        // },
         {
           code: "zzjrl",
           name: "装机容量(MW)",