五项损失率功能修改

src/views/benchMarking/FiveLossLineTable.vue

@@ -377,7 +377,7 @@ export default {
                     '故障损失电量单位:万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].fdl,data2:this.multipleSelection[1].fdl});
+              this.getTableData.push({index:'发电量',data1:this.multipleSelection[0].scadafdl,data2:this.multipleSelection[1].scadafdl});
               this.getTableData.push({index:'故障损失电量',data1:this.multipleSelection[0].gzss,data2:this.multipleSelection[1].gzss});
               this.getTableData.push({index:'检修损失电量',data1:this.multipleSelection[0].jxssl,data2:this.multipleSelection[1].jxssl});
               this.getTableData.push({index:'性能未达标损失电量',data1:this.multipleSelection[0].xnsslfraction,data2:this.multipleSelection[1].xnsslfraction});

src/views/benchMarking/FiveLossRates.vue

@@ -13,7 +13,16 @@
               </el-option>
             </el-select>
             </el-form-item>
-
+            <el-form-item label="分类">
+              <el-select v-model="value2"  placeholder="请选择">
+              <el-option
+                v-for="item in classification"
+                :key="item.label"
+                :label="item.label"
+                :value="item.id">
+              </el-option>
+            </el-select>
+            </el-form-item>
             <!-- <el-form-item label="项目">
               <el-input
                 v-model="formInline.project"
@@ -68,7 +77,7 @@
             :header-cell-style="headStyle"
             @selection-change="handleSelectionChange"
             @sort-change="changeTableSort"
-            style="font-size: 10px;"  >
+            style="font-size: 10px;"  v-if="value2=='xn'">
             <el-table-column label="损失率对标列表">
             <el-table-column
               type="index"
@@ -83,127 +92,254 @@
               label="风机"
               width="300">
             </el-table-column>
-            <!-- <el-table-column
-              prop="ordernum"
-              label="排名"
-              width="60">
+             <el-table-column
+             :sortable="'custom'"
+              prop="qfssnum"
+              label="性能损失电量排名"
+               width="300">
             </el-table-column>
             <el-table-column
-              prop="gzssnum"
-              label="故障排名"
-               width="70">
+            :sortable="'custom'"
+              prop="qfss"
+              label="性能损失电量"
+               width="300">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
-              prop="gzss"
-              label="故障损失"
-               width="70">
+              prop="xnsslnum"
+              label="性能损失率排名"
+               width="300">
             </el-table-column>
-             <el-table-column
-              prop="whssnum"
-              label="检修排名"
-               width="70">
+            <el-table-column
+            :sortable="'custom'"
+              prop="xnssl"
+              label="性能损失率(%)"
+               width="300">
             </el-table-column>
             <el-table-column
-              prop="whss"
-              label="检修损失"
-               width="70">
-            </el-table-column> -->
+              prop="address"
+              label="操作"
+               width="300">
+               <template slot-scope="scope">
+                  <el-button size="mini"  @click="handleEdit(scope.$index, scope.row)">详情</el-button>
+               </template>
+            </el-table-column>
+          </el-table-column>
+       </el-table>
+       <el-table
+            :data="gridData"
+            :row-style="{ height: '10px' }" 
+            :cell-style="{ textAlign: 'center',padding:'1px' }" 
+            :header-cell-style="headStyle"
+            @selection-change="handleSelectionChange"
+            @sort-change="changeTableSort"
+            style="font-size: 10px;"  v-if="value2=='qf'">
+            <el-table-column label="损失率对标列表">
+            <el-table-column
+              type="index"
+              width="30">
+            </el-table-column>
+            <el-table-column
+              type="selection"
+              width=45>
+            </el-table-column>
+            <el-table-column
+              prop="wpName"
+              label="风机"
+              width="300">
+            </el-table-column>
              <el-table-column
              :sortable="'custom'"
-              prop="qfssnum"
-              label="性能损失电量排名"
+              prop="qfl"
+              label="弃风率"
                width="300">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
-              prop="qfss"
-              label="性能损失电量"
+              prop="qflnum"
+              label="弃风率排名"
                width="300">
             </el-table-column>
             <!-- <el-table-column
-              prop="xdssnum"
-              label="限电排名"
-               width="70">
+            :sortable="'custom'"
+              prop="xnsslnum"
+              label="性能损失率排名"
+               width="300">
             </el-table-column>
             <el-table-column
-              prop="xdss"
-              label="限电损失"
-               width="70">
+            :sortable="'custom'"
+              prop="xnssl"
+              label="性能损失率(%)"
+               width="300"> -->
             </el-table-column>
             <el-table-column
-              prop="slssnum"
-              label="受累排名"
-               width="70">
+              prop="address"
+              label="操作"
+               width="300">
+               <template slot-scope="scope">
+                  <el-button size="mini"  @click="handleEdit(scope.$index, scope.row)">详情</el-button>
+               </template>
+            </el-table-column>          
+       </el-table>
+       <el-table
+            :data="gridData"
+            :row-style="{ height: '10px' }" 
+            :cell-style="{ textAlign: 'center',padding:'1px' }" 
+            :header-cell-style="headStyle"
+            @selection-change="handleSelectionChange"
+            @sort-change="changeTableSort"
+            style="font-size: 10px;"  v-if="value2=='gz'">
+            <el-table-column label="损失率对标列表">
+            <el-table-column
+              type="index"
+              width="30">
             </el-table-column>
             <el-table-column
-              prop="slss"
-              label="受累损失"
-               width="70">
+              type="selection"
+              width=45>
+            </el-table-column>
+            <el-table-column
+              prop="wpName"
+              label="风机"
+              width="300">
             </el-table-column>
              <el-table-column
+             :sortable="'custom'"
+              prop="gzssnum"
+              label="故障损失电量排名"
+               width="300">
+            </el-table-column>
+            <el-table-column
+            :sortable="'custom'"
+              prop="gzss"
+              label="故障损失电量"
+               width="300">
+            </el-table-column>
+            <el-table-column
+            :sortable="'custom'"
               prop="gzsslnum"
               label="故障损失率排名"
-               width="110">
+               width="300">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="gzssl"
-              label="故障损失率"
-               width="85">
+              label="故障损失率(%)"
+               width="300">
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="操作"
+               width="300">
+               <template slot-scope="scope">
+                  <el-button size="mini"  @click="handleEdit(scope.$index, scope.row)">详情</el-button>
+               </template>
+            </el-table-column>
+          </el-table-column>
+       </el-table>
+       <el-table
+            :data="gridData"
+            :row-style="{ height: '10px' }" 
+            :cell-style="{ textAlign: 'center',padding:'1px' }" 
+            :header-cell-style="headStyle"
+            @selection-change="handleSelectionChange"
+            @sort-change="changeTableSort"
+            style="font-size: 10px;"  v-if="value2=='jx'">
+            <el-table-column label="损失率对标列表">
+            <el-table-column
+              type="index"
+              width="30">
+            </el-table-column>
+            <el-table-column
+              type="selection"
+              width=45>
+            </el-table-column>
+            <el-table-column
+              prop="wpName"
+              label="风机"
+              width="300">
             </el-table-column>
              <el-table-column
+             :sortable="'custom'"
+              prop="whssnum"
+              label="检修损失电量排名"
+               width="300">
+            </el-table-column>
+            <el-table-column
+            :sortable="'custom'"
+              prop="whss"
+              label="检修损失电量"
+               width="300">
+            </el-table-column>
+            <el-table-column
+            :sortable="'custom'"
               prop="jxsslnum"
               label="检修损失率排名"
-               width="110">
-            </el-table-column> -->
-            <!-- <el-table-column
+               width="300">
+            </el-table-column>
+            <el-table-column
+            :sortable="'custom'"
               prop="jxssl"
-              label="检修损失率"
-               width="85">
+              label="检修损失率(%)"
+               width="300">
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="操作"
+               width="300">
+               <template slot-scope="scope">
+                  <el-button size="mini"  @click="handleEdit(scope.$index, scope.row)">详情</el-button>
+               </template>
+            </el-table-column>
+          </el-table-column>
+       </el-table>
+       <el-table
+            :data="gridData"
+            :row-style="{ height: '10px' }" 
+            :cell-style="{ textAlign: 'center',padding:'1px' }" 
+            :header-cell-style="headStyle"
+            @selection-change="handleSelectionChange"
+            @sort-change="changeTableSort"
+            style="font-size: 10px;"  v-if="value2=='sl'">
+            <el-table-column label="损失率对标列表">
+            <el-table-column
+              type="index"
+              width="30">
+            </el-table-column>
+            <el-table-column
+              type="selection"
+              width=45>
+            </el-table-column>
+            <el-table-column
+              prop="wpName"
+              label="风机"
+              width="300">
             </el-table-column>
              <el-table-column
-              prop="qflnum"
-              label="弃风率排名"
-               width="90">
-            </el-table-column> -->
-            <!-- <el-table-column
-              prop="qfl"
-              label="弃风率"
-               width="70">
-            </el-table-column> -->
+             :sortable="'custom'"
+              prop="slssnum"
+              label="受累损失电量排名"
+               width="300">
+            </el-table-column>
             <el-table-column
             :sortable="'custom'"
-              prop="xnsslnum"
-              label="性能损失率排名"
+              prop="slss"
+              label="受累损失电量"
                width="300">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
-              prop="xnssl"
-              label="性能损失率(%)"
+              prop="slsslnum"
+              label="受累损失率排名"
                width="300">
             </el-table-column>
-            <!-- <el-table-column
-              prop="slssl"
-              label="受累损失率"
-               width="81">
-            </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="fwjsl"
-              label="复位及时率"
-               width="81">
-            </el-table-column>
-            <el-table-column
-              prop="xqjsl"
-              label="消缺及时率"
-               width="81">
+              label="受累损失率(%)"
+               width="300">
             </el-table-column>
             <el-table-column
-              prop="ztzhjsl"
-              label="状态转换率"
-               width="81">
-            </el-table-column> -->
-             <el-table-column
               prop="address"
               label="操作"
                width="300">
@@ -211,7 +347,7 @@
                   <el-button size="mini"  @click="handleEdit(scope.$index, scope.row)">详情</el-button>
                </template>
             </el-table-column>
-            </el-table-column>
+          </el-table-column>
        </el-table>
        	<el-dialog class="el-dialog_body" width="60%" title="对标信息分析" :visible.sync="dialogTableVisible" append-to-body>
 							<div class="margin">
@@ -279,6 +415,25 @@ export default {
         currentPage2: 1,
         pagesize: 10,
         fdcLineData:'',
+        classification: [{
+          id:'qf',
+          label: '弃风率'
+        }, {
+          id:'gz',
+          label: '故障损失率'
+        },
+        {
+          id:'jx',
+          label: '检修损失率'
+        },
+        {
+          id:'xn',
+          label: '性能损失率'
+        },
+        {
+          id:'sl',
+          label: '受累损失率'
+        }],
         options: [{
           value: 'MHS_FDC',
           label: '麻黄山风电场'
@@ -299,6 +454,7 @@ export default {
           label: '香山风电场'
         }],
         value: '',
+        value2:'gz',
         wpId:[],
         wpName:[],
         orderByColumn:'',
@@ -476,16 +632,12 @@ export default {
       let that = this;
       this.$http.get('/powercompare/windfarmAjax').then((res) => {
         that.options = res.data.data;
-        // console.log(this.options)
       })
       if(this.timedate == ''){
-        // this.$message({
-        //   message:'请选择时间',
-        //   type:'warning'
-        // });
-        this.beginDate = '2021-01-01';
-        this.endDate = '2021-01-04';
-        // return;
+        this.timedate[0] = '2021-01-01';
+        this.timedate[1] = '2021-01-04';
+        this.beginDate = this.timedate[0];
+        this.endDate = this.timedate[1];
       }else{
         this.beginDate = this.timedate[0];
         this.endDate = this.timedate[1];
@@ -505,10 +657,8 @@ export default {
           that.$refs.FiveLossRatesPieChart.getPackageData(that.gridData);
           that.$refs.FiveLossRatesHistogramChart.getPackageData2(that.gridData);
       })
-      
     },
     drawPie() {
-        // console.log(this.sortInOrder)
 				var charts;
 				if (charts != null && charts != "" && charts != undefined){
 				    charts.dispose();