4-27 场内场际

src/assets/js/benchmarkingSys/newPerformanceList.js

@@ -379,7 +379,7 @@ export default {
       }
     },
     queryApDataMx() {
-      this.$router.push({ path: "/performanceList_fan" });
+      this.$router.push({ path: "/performanceList" });
     },
     // toExcel() {
     //    let that = this;

src/assets/js/benchmarkingSys/yardBenchmark.js

@@ -42,8 +42,8 @@ export default {
       this.dialogTableVisible = true;
       this.check_wpid();
       this.$nextTick(function () {
-        this.ECZM.leida_tc("leidatu" , this.getChartDataValue,this.BASE.getBzDate(new Date(this.wp_n_1.recordDate),0),this.getChartDataValue2,this.BASE.getBzDate(new Date(this.wp_n_2.recordDate),0));
-        this.ECZM.bar_tc("histogram_n" , this.wp_n_1 , this.wp_n_2);
+        this.ECZM.leida_tc("leidatu" , this.getChartDataValue,this.fdcName1,this.getChartDataValue2,this.fdcName2);
+        this.ECZM.bar_tc("histogram_n" , this.wp_n_1 , this.wp_n_2 , this.wp_n_1.wpId , this.wp_n_2.wpId);
       });
     },
     headStyle() {
@@ -200,28 +200,6 @@ export default {
      * 跳转详情页面
      */
     handleEdit(a, b) {
-      this.wpId = [];
-      this.lineDataOption = [];
-      if (this.selectrowdate.length == 2) {
-        for (let i = 0; i < this.selectrowdate.length; i++) {
-          this.wpId.push(this.selectrowdate[i].wpId);
-          this.wpName.push(this.selectrowdate[i].wpName);
-          this.lineDataOption.push({
-            id: this.selectrowdate[i].wpId,
-            name: this.selectrowdate[i].wpName,
-          });
-        }
-        this.$router.push({
-          path: "/yardBenchmarkParticulars",
-          query: {
-            wpId: this.wpId,
-            beginDate: this.beginDate,
-            endDate: this.endDate,
-            wpName: this.wpName,
-            select: this.lineDataOption,
-          },
-        });
-      } else {
         this.lineDataOption.push({ id: b.wpId, name: b.wpName });
         this.$router.push({
           path: "/yardBenchmarkParticulars",
@@ -233,7 +211,6 @@ export default {
             select: this.lineDataOption,
           },
         });
-      }
     },
     /**
      * 查询场内对标列表信息
@@ -269,35 +246,7 @@ export default {
           
         }
 
-        //this.drawhistoram();
-        this.ECZM.getBar_fdd("histogram",[
-          {
-            name: "限电损失电量(单位：万kwh)",
-            type: "bar",
-            data: this.histogram.xdss,
-          },
-          {
-            name: "故障损失电量(单位：万kwh)",
-            type: "bar",
-            data: this.histogram.gzss,
-          },
-          ,
-          {
-            name: "检修损失电量(单位：万kwh)",
-            type: "bar",
-            data: this.histogram.jxss,
-          },
-          {
-            name: "性能损失电量(单位：万kwh)",
-            type: "bar",
-            data: this.histogram.xnss,
-          },
-          {
-            name: "受累损失电量(单位：万kwh)",
-            type: "bar",
-            data: this.histogram.slss,
-          },
-        ],this.histogram.date);
+        this.ECZM.getBar_fdd("histogram",this.histogram);
       }).catch(error =>{
         this.$message.error('获取数据失败');
       });
@@ -311,250 +260,6 @@ export default {
 
       return this.BASE.getBzDate(date,0);
     },
-    
-    drawleidatu() {
-      var chartDom = document.getElementById("leidatu");
-      var myChart = echarts.init(chartDom);
-      var option;
-
-      option = {
-        title: {
-          text: "对标排名分析",
-          left: 400,
-          top: -5,
-          textStyle: {
-            fontSize: 13,
-          },
-        },
-        grid: {
-          top: "10%",
-          left: "10%",
-          right: "10%",
-          bottom: "0",
-        },
-        tooltip: {},
-        legend: {
-          orient: "vertical",
-          x: "left", //可设定图例在左、右、居中
-          y: "0", //可设定图例在上、下、居中
-          padding: [0, 50, 0, 0],
-        },
-        radar: {
-          // shape: 'circle',
-          name: {
-            textStyle: {
-              color: "#fff",
-              backgroundColor: "#999",
-              borderRadius: 3,
-              padding: [3, 5],
-            },
-          },
-          indicator: [
-            { name: "风能利用率", max: 100 },
-            { name: "故障损失率", max: 100 },
-            { name: "检修损失率", max: 100 },
-            { name: "弃风率", max: 100 },
-            { name: "性能损失率", max: 100 },
-            { name: "受累损失率", max: 100 },
-            { name: "复位及时率", max: 100 },
-            { name: "状态转换率", max: 100 },
-            { name: "消缺及时率", max: 100 },
-          ],
-        },
-        series: [
-          {
-            name: "预算 vs 开销（Budget vs spending）",
-            type: "radar",
-            // areaStyle: {normal: {}},
-            data: [
-              {
-                value: this.getChartDataValue,
-                name: this.BASE.getBzDate(new Date(this.wp_n_1.recordDate),0),
-              },
-              {
-                value: this.getChartDataValue2,
-                name: this.BASE.getBzDate(new Date(this.wp_n_2.recordDate),0),
-              },
-            ],
-          },
-        ],
-      };
-
-      option && myChart.setOption(option);
-    },
-
-    drawhistogram_n() {
-      var chartDom = document.getElementById("histogram_n");
-      var myChart = echarts.init(chartDom);
-      var option;
-
-      option = {
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            type: "cross",
-            crossStyle: {
-              color: "#999",
-            },
-          },
-        },
-        title: {
-          text: "损失电量分析",
-          left: 100,
-          top: 8,
-          textStyle: {
-            fontSize: 13,
-          },
-        },
-        grid: {
-          top: "90",
-          left: "10%",
-          right: "10%",
-          bottom: "30",
-        },
-        legend: {
-          orient: "vertical",
-          x: "right", //可设定图例在左、右、居中
-          y: 0, //可设定图例在上、下、居中
-          padding: [0, 50, 200, 0],
-          data: [
-            "限电损失电量(单位：万kwh)",
-            "故障损失电量(单位：万kwh)",
-            "检修损失电量(单位：万kwh)",
-            "性能损失电量(单位：万kwh)",
-            "受累损失电量(单位：万kwh)",
-          ],
-        },
-        xAxis: [
-          {
-            type: "category",
-            data: [
-              this.BASE.getBzDate(new Date(this.wp_n_1.recordDate),0),
-              this.BASE.getBzDate(new Date(this.wp_n_2.recordDate),0),
-            ],
-            axisPointer: {
-              type: "shadow",
-            },
-          },
-        ],
-        yAxis: [
-          {
-            type: "value",
-            name: "电量",
-
-            interval: 50,
-            axisLabel: {
-              formatter: "{value} 万kw",
-            },
-          },
-        ],
-        series: [
-          {
-            name: "限电损失电量(单位：万kwh)",
-            type: "bar",
-            yAxisIndex: 0,
-            data: [this.wp_n_1.xdss, this.wp_n_2.xdss],
-          },
-          {
-            name: "故障损失电量(单位：万kwh)",
-            type: "bar",
-            yAxisIndex: 0,
-            data: [this.wp_n_1.zzss, this.wp_n_2.gzss],
-          },
-          {
-            name: "检修损失电量(单位：万kwh)",
-            type: "bar",
-            yAxisIndex: 0,
-            data: [this.wp_n_1.jxss, this.wp_n_2.jxss],
-          },
-          {
-            name: "性能损失电量(单位：万kwh)",
-            type: "bar",
-            yAxisIndex: 0,
-            data: [this.wp_n_1.xnss, this.wp_n_2.xnss],
-          },
-          {
-            name: "受累损失电量(单位：万kwh)",
-            type: "bar",
-            yAxisIndex: 0,
-            data: [this.wp_n_1.slss, this.wp_n_2.slss],
-          },
-        ],
-      };
-
-      option && myChart.setOption(option);
-    },
-    drawhistogram() {
-      var app = {};
-      var chartDom = document.getElementById("histogram");
-
-      var myChart = echarts.init(chartDom);
-      var option;
-
-      option = {
-        title: {
-          text: "损失电量分析",
-        },
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            type: "shadow",
-          },
-        },
-        legend: {
-          data: [
-            "限电损失电量(单位：万kwh)",
-            "故障损失电量(单位：万kwh)",
-            "检修损失电量(单位：万kwh)",
-            "性能损失电量(单位：万kwh)",
-            "受累损失电量(单位：万kwh)",
-          ],
-        },
-        grid: {
-          left: "3%",
-          right: "4%",
-          bottom: "3%",
-          containLabel: true,
-        },
-        yAxis: {
-          type: "value",
-          boundaryGap: [0, 0.01],
-        },
-        xAxis: {
-          type: "category",
-          data: this.histogram.date,
-        },
-        series: [
-          {
-            name: "限电损失电量(单位：万kwh)",
-            type: "bar",
-            data: this.histogram.xdss,
-          },
-          {
-            name: "故障损失电量(单位：万kwh)",
-            type: "bar",
-            data: this.histogram.gzss,
-          },
-          ,
-          {
-            name: "检修损失电量(单位：万kwh)",
-            type: "bar",
-            data: this.histogram.jxss,
-          },
-          {
-            name: "性能损失电量(单位：万kwh)",
-            type: "bar",
-            data: this.histogram.xnss,
-          },
-          {
-            name: "受累损失电量(单位：万kwh)",
-            type: "bar",
-            data: this.histogram.slss,
-          },
-        ],
-      };
-      option && myChart.setOption(option);
-    },
   },
   mounted() {
     this.query_fc();

src/assets/js/benchmarkingSys/yardBenchmarkParticulars.js

@@ -23,6 +23,8 @@ export default {
       fdcName2: "",
       sortInOrde2: [],
       getTableData: [],
+      wp_n_1: {},
+      wp_n_2: {},
     };
   },
   filters: {
@@ -33,10 +35,10 @@ export default {
       return value.toFixed(2);
     },
   },
-  created() {
+  activated() {
+    this.timedate = [];
     this.wpId = this.$route.query.wpId;
-    this.timedate[0] = this.$route.query.beginDate;
-    this.timedate[1] = this.$route.query.endDate;
+    this.timedate.push(this.$route.query.beginDate,this.$route.query.endDate); 
     this.queryApData();
   },
   methods: {
@@ -50,8 +52,12 @@ queryApData() {
 
   queryApDataMx() {
     this.dialogTableVisible = true;
-
+    this.wp_n_1 = {};
+    this.wp_n_2 = {};
+    this.getTableData = [];
     if (this.multipleSelection.length == 2) {
+      this.wp_n_1 = this.multipleSelection[0];
+      this.wp_n_2 = this.multipleSelection[1];
       this.fdcName1 = this.multipleSelection[0].wtName;
       this.fdcName2 = this.multipleSelection[1].wtName;
       this.sortInOrder.push(
@@ -76,18 +82,6 @@ queryApData() {
         this.multipleSelection[1].jxssl,
         this.multipleSelection[1].gzssl
       );
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        this.sortInOrde2.push({
-          product:
-            this.multipleSelection[i].wtName +
-            this.BASE.getBzDate(this.multipleSelection[i].recordDate,0),
-          "限电损失电量单位:万KWh": this.multipleSelection[i].xdss,
-          "故障损失电量单位:万KWh": this.multipleSelection[i].gzss,
-          "检修损失电量单位:万KWh": this.multipleSelection[i].jxssl,
-          "性能损失电量单位:万KWh": this.multipleSelection[i].xnssl,
-          "受累损失电量单位:万KWh": this.multipleSelection[i].slss,
-        });
-      }
       this.getTableData.push({
         index: "发电量",
         data1: this.multipleSelection[0].scadafdl,
@@ -160,9 +154,8 @@ queryApData() {
       });
     }
     this.$nextTick(function () {
-      this.drawPie2("leiDaTu4");
       this.ECZM.leida_tc("leiDaTu3" , this.sortInOrder,this.fdcName1,this.sortInOrderTop,this.fdcName2);
-    //this.ECZM.bar_tc("histogram_n" , this.wp_n_1 , this.wp_n_2);
+      this.ECZM.bar_tc("leiDaTu4" , this.wp_n_1 , this.wp_n_2 ,this.wp_n_1.wtId , this.wp_n_2.wtId);
       
     });
   },
@@ -254,148 +247,11 @@ queryApData() {
     let date = new Date(cellValue.recordDate);
     return this.BASE.getBzDate(date,0);
   },
-  // drawPie() {
-  //   var charts;
-  //   if (charts != null && charts != "" && charts != undefined) {
-  //     charts.dispose();
-  //   }
-  //   charts = echarts.init(document.getElementById("leiDaTu3"));
-  //   let option = {
-  //     title: {
-  //       // text: '对标排名分析',
-  //       left: "center",
-  //     },
-  //     tooltip: {},
-  //     // legend: {
-  //     //     data: ['预算分配（Allocated Budget）', '实际开销（Actual Spending）'],
-  //     //     left: 'right'
-  //     // },
-  //     radar: {
-  //       // shape: 'circle',
-  //       name: {
-  //         textStyle: {
-  //           color: "#fff",
-  //           backgroundColor: "#999",
-  //           borderRadius: 3,
-  //           padding: [3, 5],
-  //         },
-  //       },
-  //       indicator: [
-  //         { name: "风能利用率", max: 150 },
-  //         { name: "消缺及时率", max: 150 },
-  //         { name: "状态转换率", max: 150 },
-  //         { name: "复位及时率", max: 150 },
-  //         { name: "受累损失率", max: 150 },
-  //         { name: "性能损失率", max: 150 },
-  //         { name: "弃风率", max: 150 },
-  //         { name: "检修损失率", max: 150 },
-  //         { name: "故障损失率", max: 150 },
-  //       ],
-  //     },
-  //     series: [
-  //       {
-  //         name: "预算 vs 开销（Budget vs spending）",
-  //         type: "radar",
-  //         // areaStyle: {normal: {}},
-  //         data: [
-  //           {
-  //             value: this.sortInOrder,
-  //             name: this.fdcName1,
-  //           },
-  //           {
-  //             value: this.sortInOrderTop,
-  //             name: this.fdcName2,
-  //           },
-  //         ],
-  //       },
-  //     ],
-  //   };
-  //   charts.clear();
-  //   charts.setOption(option);
-  // },
-  drawPie2() {
-    
-    var charts2;
-    if (charts2 != null && charts2 != "" && charts2 != undefined) {
-      charts2.dispose();
-    }
-    charts2 = echarts.init(document.getElementById("leiDaTu4"));
-    let option2 = {
-      legend: {
-        orient: "vertical",
-        left: "right",
-      },
-      tooltip: {},
-      dataset: {
-        dimensions: [
-          "product",
-          "限电损失电量单位:万KWh",
-          "故障损失电量单位:万KWh",
-          "检修损失电量单位:万KWh",
-          "性能损失电量单位:万KWh",
-          "受累损失电量单位:万KWh",
-        ],
-        source: this.sortInOrde2,
-      },
-      xAxis: { type: "category" },
-      yAxis: {},
-      series: [
-        {
-          // barGap:'100%',/*多个并排柱子设置柱子之间的间距*/
-          type: "bar",
-          barWidth: 30,
-          itemStyle: {
-            normal: {
-              color: "#D201D8",
-            },
-          },
-        },
-        {
-          type: "bar",
-          barWidth: 30,
-          itemStyle: {
-            normal: {
-              color: "#FD0100",
-            },
-          },
-        },
-        {
-          type: "bar",
-          barWidth: 30,
-          itemStyle: {
-            normal: {
-              color: "#FF7B16",
-            },
-          },
-        },
-        {
-          type: "bar",
-          barWidth: 30,
-          itemStyle: {
-            normal: {
-              color: "#8085E9",
-            },
-          },
-        },
-        {
-          type: "bar",
-          barWidth: 30,
-          itemStyle: {
-            normal: {
-              color: "#A6A6A6",
-            },
-          },
-        },
-      ],
-    };
-    charts2.clear();
-    charts2.setOption(option2);
-  },
   /**
    * 返回按钮
    */
   goReturn() {
-    this.$router.push("/benchmark_Venue");
+    this.$router.push("/yardBenchmark");
   },
   /**
    * 导出表格

src/router/zm.js

@@ -51,7 +51,7 @@ export default [
     path:'/individualHistoryinformation',
     component: r => require.ensure([], () => r(require('@views/singlePerformanceAnalysis/individualHistoryinformation')), 'benchmarkingSys')
   },
-  { // 单机信息总览 (历史)
+  { // 单机信息总览 ()
     path:'/individualPandectinformationdetails',
     component: r => require.ensure([], () => r(require('@views/singlePerformanceAnalysis/individualPandectinformationdetails')), 'benchmarkingSys')
   },
@@ -66,5 +66,17 @@ export default [
   { // 风机功率排布图
     path:'/powerChart',
     component: r => require.ensure([], () => r(require('@views/singlePerformanceAnalysis/powerChart')), 'benchmarkingSys')
+  },
+  { // 拟合优度排行
+    path:'/goodnessfitRank',
+    component: r => require.ensure([], () => r(require('@views/normRanking/goodnessfitRank')), 'benchmarkingSys')
+  },
+  { // 总发电量排行
+    path:'/grossgenerationRank',
+    component: r => require.ensure([], () => r(require('@views/normRanking/grossgenerationRank')), 'benchmarkingSys')
+  },
+  { // 损失率排行
+    path:'/percentageLossrRank',
+    component: r => require.ensure([], () => r(require('@views/normRanking/percentageLossrRank')), 'benchmarkingSys')
   }
-]
+]

src/tools/echartsToolzm.js

@@ -36,13 +36,14 @@ const color = ["#00FFF0","#014EB5","#A800FF","#e82edb","#B5454C","#443bff","#e8c
         ]
  *  xdata :  横坐标数据
  * */
-export function getBar_fdd(id, data , xdata) {
+export function getBar_fdd(id, data ) {
   if(data === undefined){
     message.error("没有找到报表数据，请检查！");
     return;
   }
   var myChart = EC.init(document.getElementById(id));
-  var option = {
+  var option;
+  option = {
     title: {
       text: "损失电量分析",
     },
@@ -73,9 +74,36 @@ export function getBar_fdd(id, data , xdata) {
     },
     xAxis: {
       type: "category",
-      data: xdata,
+      data: data.date,
     },
-    series: data,
+    series: [
+      {
+        name: "限电损失电量(单位：万kwh)",
+        type: "bar",
+        data: data.xdss,
+      },
+      {
+        name: "故障损失电量(单位：万kwh)",
+        type: "bar",
+        data: data.gzss,
+      },
+      ,
+      {
+        name: "检修损失电量(单位：万kwh)",
+        type: "bar",
+        data: data.jxss,
+      },
+      {
+        name: "性能损失电量(单位：万kwh)",
+        type: "bar",
+        data: data.xnss,
+      },
+      {
+        name: "受累损失电量(单位：万kwh)",
+        type: "bar",
+        data: data.slss,
+      },
+    ],
   };
   myChart.setOption(option, true);
 }
@@ -168,7 +196,7 @@ export function leida_tc(id , value1 , name1 , value2 , name2) {
  * @param {第二台风机数据} value2 
  * @returns 
  */
-export function bar_tc(id , value1 , value2) {
+export function bar_tc(id , value1 , value2 , n1 , n2) {
   if(value1 === undefined || value2 === undefined){
     message.error("没有找到报表数据，请检查！");
     return;
@@ -201,9 +229,8 @@ export function bar_tc(id , value1 , value2) {
     },
     legend: {
       orient: "vertical",
-      x: "right", //可设定图例在左、右、居中
-      y: 0, //可设定图例在上、下、居中
-      padding: [0, 50, 200, 0],
+      right: "0%",
+      padding: [6, 99, 9, 5],
       data: [
         "限电损失电量(单位：万kwh)",
         "故障损失电量(单位：万kwh)",
@@ -216,8 +243,8 @@ export function bar_tc(id , value1 , value2) {
       {
         type: "category",
         data: [
-          BASE.getBzDate(new Date(value1.recordDate),0),
-          BASE.getBzDate(new Date(value2.recordDate),0),
+          BASE.getBzDate(new Date(value1.recordDate),0)+"/"+n1,
+          BASE.getBzDate(new Date(value2.recordDate),0)+"/"+n2,
         ],
         axisPointer: {
           type: "shadow",
@@ -246,7 +273,7 @@ export function bar_tc(id , value1 , value2) {
         name: "故障损失电量(单位：万kwh)",
         type: "bar",
         yAxisIndex: 0,
-        data: [value1.zzss, value2.gzss],
+        data: [value1.gzss, value2.gzss],
       },
       {
         name: "检修损失电量(单位：万kwh)",

src/views/benchmarkingSys/innationBenchmarkParticulars.vue

@@ -459,7 +459,7 @@
             </el-table-column>
         </el-table>
         </el-card>
-        <el-dialog class="el-dialog_body" width="60%" title="对标信息分析" :visible.sync="dialogTableVisible" append-to-body>
+        <el-dialog class="el-dialog_body" width="60%" title="对标信息分析" :visible.sync="dialogTableVisible" :modal-append-to-body="false" append-to-body>
 							<div class="margin">
                 <el-row>
                   <el-col :span="12">

src/views/benchmarkingSys/internationalBenchmark.vue

@@ -235,6 +235,7 @@
         width="60%"
         title="对标信息分析"
         :visible.sync="dialogTableVisible"
+        :modal-append-to-body="false"
         append-to-body
       >
         <div class="margin">

src/views/benchmarkingSys/projectBenchmark.vue

@@ -250,6 +250,7 @@
         width="60%"
         title="对标信息分析"
         :visible.sync="dialogTableVisible"
+        :modal-append-to-body="false"
         append-to-body
       >
         <div class="margin">

src/views/benchmarkingSys/projectBenchmarkParticulars.vue

@@ -569,6 +569,7 @@
         width="60%"
         title="对标信息分析"
         :visible.sync="dialogTableVisible"
+        :modal-append-to-body="false"
         append-to-body
       >
         <div class="margin">

src/views/benchmarkingSys/propertBenchmark.vue

@@ -346,6 +346,7 @@
         width="60%"
         title="对标信息分析"
         :visible.sync="dialogTableVisible"
+        :modal-append-to-body="false"
         append-to-body
       >
         <div class="margin">

src/views/benchmarkingSys/propertBenchmarkParticulars.vue

@@ -549,6 +549,7 @@
         width="60%"
         title="对标信息分析"
         :visible.sync="dialogTableVisible"
+        :modal-append-to-body="false"
         append-to-body
       >
         <div class="margin">

src/views/benchmarkingSys/yardBenchmark.vue

@@ -62,6 +62,7 @@
       <el-dialog
         title="对标信息分析"
         :visible.sync="dialogTableVisible"
+        :modal-append-to-body="false"
         width="65%"
       >
         <el-row>

src/views/benchmarkingSys/yardBenchmarkParticulars.vue

@@ -280,35 +280,26 @@
         </el-table>
       </el-card>
       <el-dialog
-        class="el-dialog_body"
-        width="60%"
+        width="65%"
         title="对标信息分析"
         :visible.sync="dialogTableVisible"
-        append-to-body
+        :modal-append-to-body="false"
       >
-        <div class="margin">
-          <div class="dialogLeftData">
-            <div id="leiDaTu3" class="echart"></div>
-            <div id="leiDaTu4" class="echart"></div>
-          </div>
-          <div class="dialogRightData">
-            <el-table
-              :data="getTableData"
-              height="618"
-              :row-style="{ height: '10px' }"
-              border
-              :header-cell-style="headStyle"
-              :cell-style="{ textAlign: 'center', padding: '7px' }"
-              style="width: 100%; font-size: 10px"
-            >
+       <el-row>
+          <el-col :span="12">
+            <div id="leiDaTu3" style="width: 600px; height: 350px"></div>
+            <div id="leiDaTu4" style="width: 600px; height: 350px"></div>
+          </el-col>
+          <el-col :span="12">
+            <el-table :data="getTableData">
               <el-table-column prop="index" label="指标"> </el-table-column>
               <el-table-column prop="data1" :label="fdcName1">
               </el-table-column>
               <el-table-column prop="data2" :label="fdcName2">
               </el-table-column>
             </el-table>
-          </div>
-        </div>
+          </el-col>
+        </el-row>
       </el-dialog>
     </div>
   </div>