3-26

src/utils/date_1.js

@@ -0,0 +1,33 @@
+export default function(data = 1){
+    let myDate;
+  
+    if(data !== 1){
+      myDate = new Date(data * 1000);
+    }else{
+      myDate = new Date();
+    }
+  
+    let Y = myDate.getFullYear(),
+        M = myDate.getMonth() + 1,
+        D = myDate.getDate()-1;
+        // H = myDate.getHours(),
+        // Min = myDate.getMinutes(),
+        // S = myDate.getSeconds();
+  
+    if(M < 10){
+      M = '0' + M ;
+    }
+    if(D < 10){
+      D = '0' + D ;
+    }
+    // if(H < 10){
+    //   H = '0' + H ;
+    // }
+    // if(Min < 10){
+    //   Min = '0' + Min ;
+    // }
+    // if(S < 10){
+    //   S = '0' + S ;
+    //}
+    return Y + '-' + M + '-' + D;
+  }

src/views/BorderBenchmark/InnationBenchmark_particulars.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="box">
         <div class="searchBar">
-        <el-form :inline="true" :model="formInline" class="demo-form-inline">
+        <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin-left:1%">
           <el-row :gutter="1">
             <el-form-item label="风场一">
-              <el-select v-model="value"  multiple placeholder="请选择">
+              <el-select v-model="value"   placeholder="请选择">
               <el-option
                 v-for="item in options"
                 :key="item.name"
@@ -15,7 +15,7 @@
             </el-form-item>
             
             <el-form-item label="风场二">
-              <el-select v-model="value2" multiple placeholder="请选择">
+              <el-select v-model="value2"  placeholder="请选择">
               <el-option
                 v-for="item in options"
                 :key="item.name"
@@ -49,13 +49,15 @@
         </el-form>
         <el-card>
         <el-table
+            v-loading="loading"
             :data="fdcLineData"
             :row-style="{ height: '10px' }" 
-            :cell-style="{ textAlign: 'center',padding:'1px' }" 
+            :cell-style="{ textAlign: 'center'}" 
             :header-cell-style="headStyle"
             @selection-change="handleSelectionChange"
             @sort-change="changeTableSort"
-            style="font-size: 10px;margin-bottom:100px;widht:100%"
+            max-height="388px"
+            style="margin-bottom:18px;widht:100%"
             >
             <el-table-column label="场际对标列表一">
             <el-table-column
@@ -70,46 +72,38 @@
             <el-table-column
               prop="wtId"
               label="风机名称"
-              width="80">
-            </el-table-column>
-            <el-table-column
-              sortable
-              :formatter="filter_date"
-              prop="recordDate"
-              label="日期"
-              width="80"
-            >
+              width="100">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="ordernum"
               label="排名"
-              width="50">
+              width="80">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="scadafdlnum"
               label="发电量排名"
-               width="70">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="scadafdl"
               :formatter="filter_fdl"
               label="发电量"
-               width="70">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="gzssnum"
               label="故障排名"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="gzss"
               label="故障损失"
-               width="70">
+               width="110">
             <template slot-scope="scope">
               <span>{{scope.row.gzss | rounding}}</span>
             </template>
@@ -118,13 +112,13 @@
              :sortable="'custom'"
               prop="whssnum"
               label="检修排名"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="whss"
               label="检修损失"
-               width="80">
+               width="110">
             <template slot-scope="scope">
               <span>{{scope.row.whss | rounding}}</span>
             </template>
@@ -133,13 +127,13 @@
              :sortable="'custom'"
               prop="qfssnum"
               label="性能排名"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="qfss"
               label="性能损失"
-               width="80">
+               width="110">
             <template slot-scope="scope">
               <span>{{scope.row.qfss | rounding}}</span>
             </template>
@@ -148,13 +142,13 @@
             :sortable="'custom'"
               prop="xdssnum"
               label="限电排名"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="xdss"
               label="限电损失"
-               width="70">
+               width="110">
             <template slot-scope="scope">
               <span>{{scope.row.xdss | rounding}}</span>
             </template>
@@ -163,97 +157,97 @@
             :sortable="'custom'"
               prop="slssnum"
               label="受累排名"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="slss"
               label="受累损失"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="fnlyl"
               label="风能利用率"
-               width="70">
+               width="130">
             </el-table-column>
              <el-table-column
              :sortable="'custom'"
               prop="gzsslnum"
               label="故障损失率排名"
-               width="90">
+               width="150">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="gzssl"
               label="故障损失率"
-               width="80">
+               width="130">
             </el-table-column>
              <el-table-column
              :sortable="'custom'"
               prop="jxsslnum"
               label="检修损失率排名"
-               width="90">
+               width="150">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="jxssl"
               label="检修损失率"
-               width="80">
+               width="130">
             </el-table-column>
              <el-table-column
              :sortable="'custom'"
               prop="qflnum"
               label="弃风率排名"
-               width="80">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="qfl"
               label="弃风率"
-               width="60">
+               width="100">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="xnsslnum"
               label="性能损失率排名"
-               width="85">
+               width="150">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="xnssl"
               label="性能损失率"
-               width="81">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="slsslnum"
               label="受累损失率排名"
-               width="81">
+               width="150">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="slssl"
               label="受累损失率"
-               width="81">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="fwjsl"
               label="复位及时率"
-               width="81">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="xqjsl"
               label="消缺及时率"
-               width="81">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="ztzhjsl"
               label="状态转换率"
-               width="81">
+               width="130">
             </el-table-column>
             </el-table-column>
         </el-table>
@@ -261,17 +255,19 @@
 
         <el-card>
         <el-table
+            v-loading="loading2"
             :data="fdcLineData2"
             :row-style="{ height: '10px' }" 
-            :cell-style="{ textAlign: 'center',padding:'1px' }" 
+            :cell-style="{ textAlign: 'center'}" 
             :header-cell-style="headStyle"
             @selection-change="handleSelectionChange2"
             @sort-change="changeTableSort"
-            style="font-size: 10px;margin-bottom:100px;widht:100%"
+            max-height="388px"
+            style="widht:100%"
             v-if="tb2"
             >
             <el-table-column label="场际对标列表二">
-            <el-table-column
+             <el-table-column
               fixed
               type="index"
               width="45">
@@ -283,46 +279,38 @@
             <el-table-column
               prop="wtId"
               label="风机名称"
-              width="80">
-            </el-table-column>
-            <el-table-column
-              sortable
-              :formatter="filter_date"
-              prop="recordDate"
-              label="日期"
-              width="80"
-            >
+              width="100">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="ordernum"
               label="排名"
-              width="50">
+              width="80">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="scadafdlnum"
               label="发电量排名"
-               width="70">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="scadafdl"
               :formatter="filter_fdl"
               label="发电量"
-               width="70">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="gzssnum"
               label="故障排名"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="gzss"
               label="故障损失"
-               width="70">
+               width="110">
             <template slot-scope="scope">
               <span>{{scope.row.gzss | rounding}}</span>
             </template>
@@ -331,13 +319,13 @@
              :sortable="'custom'"
               prop="whssnum"
               label="检修排名"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="whss"
               label="检修损失"
-               width="80">
+               width="110">
             <template slot-scope="scope">
               <span>{{scope.row.whss | rounding}}</span>
             </template>
@@ -346,13 +334,13 @@
              :sortable="'custom'"
               prop="qfssnum"
               label="性能排名"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="qfss"
               label="性能损失"
-               width="80">
+               width="110">
             <template slot-scope="scope">
               <span>{{scope.row.qfss | rounding}}</span>
             </template>
@@ -361,13 +349,13 @@
             :sortable="'custom'"
               prop="xdssnum"
               label="限电排名"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="xdss"
               label="限电损失"
-               width="70">
+               width="110">
             <template slot-scope="scope">
               <span>{{scope.row.xdss | rounding}}</span>
             </template>
@@ -376,97 +364,97 @@
             :sortable="'custom'"
               prop="slssnum"
               label="受累排名"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="slss"
               label="受累损失"
-               width="70">
+               width="110">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="fnlyl"
               label="风能利用率"
-               width="70">
+               width="130">
             </el-table-column>
              <el-table-column
              :sortable="'custom'"
               prop="gzsslnum"
               label="故障损失率排名"
-               width="90">
+               width="150">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="gzssl"
               label="故障损失率"
-               width="80">
+               width="130">
             </el-table-column>
              <el-table-column
              :sortable="'custom'"
               prop="jxsslnum"
               label="检修损失率排名"
-               width="90">
+               width="150">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="jxssl"
               label="检修损失率"
-               width="80">
+               width="130">
             </el-table-column>
              <el-table-column
              :sortable="'custom'"
               prop="qflnum"
               label="弃风率排名"
-               width="80">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="qfl"
               label="弃风率"
-               width="60">
+               width="100">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="xnsslnum"
               label="性能损失率排名"
-               width="85">
+               width="150">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="xnssl"
               label="性能损失率"
-               width="81">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="slsslnum"
               label="受累损失率排名"
-               width="81">
+               width="150">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="slssl"
               label="受累损失率"
-               width="81">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="fwjsl"
               label="复位及时率"
-               width="81">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="xqjsl"
               label="消缺及时率"
-               width="81">
+               width="130">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="ztzhjsl"
               label="状态转换率"
-               width="81">
+               width="130">
             </el-table-column>
             </el-table-column>
         </el-table>
@@ -506,42 +494,8 @@ export default {
                 project: "",
                 line: "",
             },
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }],
-            options: [{
-                value: 'MHS_FDC',
-                label: '麻黄山风电场'
-                }, {
-                value: 'NSS_FDC',
-                label: '牛首山风电场'
-                },
-                {
-                value: 'SBQ_FDC',
-                label: '石板泉风电场'
-                },
-                {
-                value: 'QS_FDC',
-                label: '青山风电场'
-                },
-                {
-                value: 'XS_FDC',
-                label: '香山风电场'
-                }],
+            
+            options: [],
             value: '',
             value2:'',
             timedate: [],
@@ -567,6 +521,8 @@ export default {
             fdcND:[],
             fdcND1:'',
             fdcND2:'',
+            loading:true,
+            loading2:true,
         }
     },
     filters: {
@@ -575,6 +531,9 @@ export default {
       }
     },
     created(){
+        this.value = this.$route.query.wpId;
+        this.timedate[0] = this.$route.query.beginDate;
+        this.timedate[1] = this.$route.query.endDate;
         this.YardTableData();
     },
     methods:{
@@ -599,6 +558,7 @@ export default {
             guilty.append('endDate',this.endDate);
           this.$http.post('/contrast/benchmarkWpInWtList',guilty).then((res) => {
             this.fdcLineData2 = res.data.data;
+            this.loading2=false;
           })
             }
         },
@@ -625,7 +585,7 @@ export default {
               this.multipleSelection[1].xnssl,this.multipleSelection[1].qfl,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,'限电损失电量单位:万KWh':this.multipleSelection[i].xdss,
+              this.sortInOrde2.push({product:this.multipleSelection[i].wtName+" "+formateDate(this.multipleSelection[i].recordDate/1000),'限电损失电量单位:万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});
               }
@@ -680,10 +640,11 @@ export default {
             guilty.append('endDate',this.endDate);
           this.$http.post('/contrast/benchmarkWpInWtList',guilty).then((res) => {
             this.fdcLineData = res.data.data;
+            this.loading = false;
           })
         },
         headStyle() {
-			    return "text-align:center"
+			    return "text-align:left"
 		    },
         handleSelectionChange(val) {
             this.sortInOrder = [];
@@ -890,11 +851,16 @@ export default {
 		text-align: center;
 		float: left;
 	}
-
 	.dialogRightData {
 		width: 50%;
 		height: 650px;
 		text-align: center;
 		float: left;
 	}
+    /deep/::-webkit-scrollbar {
+    z-index: 99999999;
+    width: 6px;
+    height: 13px !important;
+    background-color: #f5f5f5;
+}
 </style>

src/views/BorderBenchmark/InternationalBenchmark.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="box">
     <div class="searchBar">
-      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form :inline="true" class="demo-form-inline" style="margin-left:1%">
         <el-row :gutter="1">
           <el-form-item label="风场">
             <el-select v-model="value" multiple placeholder="请选择">
               <el-option
-                v-for="item in options"
+                v-for="item in FClist"
                 :key="item.name"
                 :label="item.name"
                 :value="item.id"
@@ -14,23 +14,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="项目">
-              <el-input
-                v-model="formInline.project"
-                id="project"
-                placeholder="项目"
-                @focus="checkwindfarm"
-              ></el-input>
-            </el-form-item>
-
-            <el-form-item label="线路">
-              <el-input
-                v-model="formInline.line"
-                id="line"
-                placeholder="线路"
-                @focus="checkproject"
-              ></el-input>
-            </el-form-item> -->
 
           <el-form-item label="选择时间：">
             <el-date-picker
@@ -60,11 +43,10 @@
       <el-table
         :data="gridData"
         :row-style="{ height: '10px' }"
-        :cell-style="{ textAlign: 'center', padding: '1px' }"
+        :cell-style="{ textAlign: 'center'}"
         :header-cell-style="headStyle"
         @selection-change="handleSelectionChange"
         @sort-change="changeTableSort"
-        style="font-size: 10px"
       >
         <el-table-column label="场外对标列表">
           <el-table-column type="index" width="50"> </el-table-column>
@@ -75,163 +57,165 @@
             width="50"
           >
           </el-table-column>
-          <el-table-column sortable prop="ordernum" label="综合排名" width="60">
+          <el-table-column sortable prop="wpName" label="风电场名称" width="130">
+          </el-table-column>
+          <el-table-column sortable prop="ordernum" label="综合排名" width="130">
           </el-table-column>
          
           <el-table-column
             sortable
             prop="scadafdlnum"
             label="发电量排名"
-            width="70"
+            width="130"
           >
           </el-table-column>
-          <el-table-column sortable prop="fdl" label="发电量" width="90">
+          <el-table-column sortable prop="fdl" :formatter="simplification" label="发电量" width="110">
           </el-table-column>
           <el-table-column
             sortable
             prop="gzssnum"
-            label="故障损失电量排名"
-            width="80"
+            label="故障损失排名"
+            width="130"
           >
           </el-table-column>
-          <el-table-column sortable prop="gzss" label="故障损失电量" width="70">
+          <el-table-column sortable prop="gzss" label="故障损失电量" width="130">
           </el-table-column>
           <el-table-column
             sortable
             prop="whssnum"
-            label="检修损失电量排名"
-            width="75"
+            label="检修损失排名"
+            width="130"
           >
           </el-table-column>
-          <el-table-column sortable prop="whss" label="检修损失电量" width="70">
+          <el-table-column sortable prop="whss" label="检修损失电量" width="130">
           </el-table-column>
           <el-table-column
             sortable
             prop="qfssnum"
-            label="性能损失电量排名"
-            width="75"
+            label="性能损失排名"
+            width="130"
           >
           </el-table-column>
-          <el-table-column sortable prop="qfss" label="性能损失电量" width="70">
+          <el-table-column sortable prop="qfss" label="性能损失电量" width="130">
           </el-table-column>
           <el-table-column
             sortable
             prop="xdssnum"
-            label="限电损失电量排名"
-            width="75"
+            label="限电损失排名"
+            width="130"
           >
           </el-table-column>
-          <el-table-column sortable prop="xdss" label="限电损失电量" width="70">
+          <el-table-column sortable prop="xdss" label="限电损失电量" width="130">
           </el-table-column>
           <el-table-column
             sortable
             prop="slssnum"
-            label="受累损失电量排名"
-            width="75"
+            label="受累损失排名"
+            width="130"
           >
           </el-table-column>
-          <el-table-column sortable prop="slss" label="受累损失电量" width="70">
+          <el-table-column sortable prop="slss" label="受累损失电量" width="130">
           </el-table-column>
           <el-table-column
             sortable
             prop="fnlylnum"
             label="风能利用率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="fnlyl"
             label="风能利用率(%)"
-            width="80"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="gzsslnum"
             label="故障损失率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="gzssl"
             label="故障损失率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="jxsslnum"
             label="检修损失率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="jxssl"
             label="检修损失率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
-          <el-table-column sortable prop="qflnum" label="弃风率排名" width="70">
+          <el-table-column sortable prop="qflnum" label="弃风率排名" width="130">
           </el-table-column>
-          <el-table-column sortable prop="qfl" label="弃风率(%)" width="65">
+          <el-table-column sortable prop="qfl" label="弃风率(%)" width="130">
           </el-table-column>
           <el-table-column
             sortable
             prop="xnsslnum"
             label="性能损失率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="xnssl"
             label="性能损失率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="slsslnum"
             label="受累损失率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="slssl"
             label="受累损失率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="fwjslnum"
             label="复位及时率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="fwjsl"
             label="复位及时率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="ztzhjslnum"
             label="状态转换率排名"
-            width="80"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="ztzhjsl"
             label="状态转换率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column fixed="right" prop="address" label="操作" width="70">
@@ -313,22 +297,15 @@
 <script>
 import FiveLossRatesHistogramChart from "../../views/benchMarking/FiveLossRatesHistogramChart.vue";
 import formateDate from "@/utils/date";
+import formateDate1 from "@/utils/date_1";
 import * as echarts from "echarts";
 export default {
   data() {
     return {
-      formInline: {
-        windfarm: "",
-        project: "",
-        line: "",
-      },
-      timedate: [
-        // {beginDate:'2021-01-01'},
-        // {endDate:'2021-01-04'}
-      ],
+      timedate: [],
       isAsc: "asc",
-      beginDate: "2021-01-01",
-      endDate: "2021-01-04",
+      beginDate: "",
+      endDate: "",
       gridData: "",
       multipleSelection: [],
       sortInOrder: [],
@@ -341,28 +318,10 @@ export default {
       currentPage2: 1,
       pagesize: 10,
       fdcLineData: "",
-      options: [
-        {
-          value: "MHS_FDC",
-          label: "麻黄山风电场",
-        },
-        {
-          value: "NSS_FDC",
-          label: "牛首山风电场",
-        },
-        {
-          value: "SBQ_FDC",
-          label: "石板泉风电场",
-        },
-        {
-          value: "QS_FDC",
-          label: "青山风电场",
-        },
-        {
-          value: "XS_FDC",
-          label: "香山风电场",
-        },
-      ],
+      FClist: {
+        name: "",
+        id: "",
+      },
       value: "",
       wpId: [],
       wpName: [],
@@ -377,7 +336,7 @@ export default {
   components: {
   },
   created() {
-    this.FiveLossInformation();
+    this.Inquire_tableDate();
   },
   methods: {
     changeFun(val) {
@@ -392,14 +351,16 @@ export default {
       return "text-align:center";
     },
     onSubmit() {
-      console.log("submit!");
     },
     handleClick() {},
     deleteRow(index, rows) {
       rows.splice(index, 1);
     },
     queryApData() {
-      this.FiveLossInformation();
+      this.Inquire_tableDate();
+    },
+    simplification(cellValue){
+      return parseFloat(cellValue.fdl).toFixed(2);
     },
     handleEdit(a, b) {
       this.wpId = [];
@@ -413,7 +374,6 @@ export default {
             name: this.multipleSelection[i].wpName,
           });
         }
-        console.log(this.lineDataOption);
         this.$router.push({
           path: "/NationBenchmark_particulars",
           query: {
@@ -426,7 +386,6 @@ export default {
         });
       } else {
         this.lineDataOption.push({ id: b.wpId, name: b.wpName });
-        console.log(this.lineDataOption);
         this.$router.push({
           path: "/NationBenchmark_particulars",
           query: {
@@ -439,22 +398,6 @@ export default {
         });
       }
     },
-    checkwindfarm() {
-      if (this.formInline.windfarm == "") {
-        this.$message.error("请选择风场！");
-        return;
-      }
-    },
-    checkproject() {
-      if (this.formInline.project == "") {
-        this.$message.error("请选择项目！");
-        return;
-      }
-      if (new Date(this.timedate) == null) {
-        this.$message.error("请选择时间");
-        return;
-      }
-    },
     queryApDataMx() {
       this.dialogTableVisible = true;
       this.$nextTick(function () {
@@ -578,10 +521,8 @@ export default {
       }
     },
     handleCurrentChange(val) {
-      // console.log(`当前页: ${val}`);
     },
     handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
       this.pagesize = val;
     },
     changeTableSort(column) {
@@ -591,23 +532,25 @@ export default {
       } else if (column.order == "ascending") {
         this.isAsc = "asc";
       }
-      this.FiveLossInformation();
+      this.Inquire_tableDate();
     },
-    FiveLossInformation() {
+    Inquire_tableDate() {
+      var newData = new Date();
+       this.timedate[0] = formateDate1(newData.getTime()/1000);
+       this.timedate[1] = formateDate1(newData.getTime()/1000);
       let that = this;
       this.$http.get("/powercompare/windfarmAjax").then((res) => {
-        that.options = res.data.data;
+        that.FClist = res.data.data;
       });
       if (this.timedate == "") {
         this.timedate[0] = "2021-01-01";
-        this.timedate[1] = "2021-01-04";
+        this.timedate[1] = "2021-01-01";
         this.beginDate = this.timedate[0];
         this.endDate = this.timedate[1];
       } else {
         this.beginDate = this.timedate[0];
         this.endDate = this.timedate[1];
       }
-      console.log(this.isAsc);
       var fiveLossData = new URLSearchParams();
       fiveLossData.append("pageNum", this.currentPage2);
       fiveLossData.append("pageSize", this.pagesize);
@@ -620,7 +563,6 @@ export default {
         .post("/contrast/benchmarkWpOutList", fiveLossData)
         .then((res) => {
           that.gridData = res.data.data;
-          // console.log(that.gridData);
           that.getPackageData(that.gridData);
           that.getPackageData2(that.gridData);
         });
@@ -968,7 +910,12 @@ export default {
   text-align: center;
   float: left;
 }
-
+  /deep/::-webkit-scrollbar {
+    z-index: 99999999;
+    width: 6px;
+    height: 13px !important;
+    background-color: #f5f5f5;
+}
 .dialogRightData {
   width: 50%;
   height: 650px;

src/views/BorderBenchmark/YardBenchmark.vue

@@ -33,7 +33,7 @@
 
             <el-form-item label="结束时间">
               <el-date-picker
-              value-format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
                 v-model="endDate"
                 type="date"
                 placeholder="选择日期"
@@ -71,12 +71,11 @@
           </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-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>
           </el-col>
         </el-row>
@@ -88,10 +87,11 @@
           ref="multipleTable"
           :data="tableData"
           tooltip-effect="dark"
-          style="width: 100%; font-size: 1px"
-          :cell-style="{ textAlign: 'center'}"
+          style="width: 100%"
+          :cell-style="{ textAlign: 'center' }"
           :header-cell-style="headStyle"
-          max-height="330px"
+          max-height="370px"
+          height="370px"
           @selection-change="changeFun"
         >
           >
@@ -108,7 +108,7 @@
               sortable
               prop="ordernum"
               label="综合排名"
-              width="60"
+              width="120"
             >
             </el-table-column>
             <el-table-column
@@ -117,218 +117,222 @@
               prop="recordDate"
               label="日期"
               value-format="yyyy-MM-dd"
-              width="80"
+              width="120"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="scadafdlnum"
               label="发电量排名"
-              width="70"
+              width="120"
             >
             </el-table-column>
-            <el-table-column sortable prop="fdl" label="发电量" width="70">
+            <el-table-column sortable prop="fdl" label="发电量" width="120">
             </el-table-column>
             <el-table-column
               sortable
               prop="gzssnum"
-              label="故障损失电量排名"
-              width="80"
+              label="故障损失排名"
+              width="139"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="gzss"
               label="故障损失电量"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="whssnum"
-              label="检修损失电量排名"
-              width="75"
+              label="检修损失排名"
+              width="139"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="whss"
               label="检修损失电量"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="qfssnum"
-              label="性能损失电量排名"
-              width="75"
+              label="性能损失排名"
+              width="139"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="qfss"
               label="性能损失电量"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="xdssnum"
-              label="限电损失电量排名"
-              width="75"
+              label="限电损失排名"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="xdss"
               label="限电损失电量"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="slssnum"
-              label="受累损失电量排名"
-              width="75"
+              label="受累损失排名"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="slss"
               label="受累损失电量"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="fnlylnum"
               label="风能利用率排名"
-              width="75"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="fnlyl"
               label="风能利用率(%)"
-              width="70"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="gzsslnum"
               label="故障损失率排名"
-              width="75"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="gzssl"
               label="故障损失率(%)"
-              width="70"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="jxsslnum"
               label="检修损失率排名"
-              width="70"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="jxssl"
               label="检修损失率(%)"
-              width="70"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="qflnum"
               label="弃风率排名"
-              width="70"
+              width="130"
             >
             </el-table-column>
-            <el-table-column sortable prop="qfl" label="弃风率(%)" width="65">
+            <el-table-column sortable prop="qfl" label="弃风率(%)" width="130">
             </el-table-column>
             <el-table-column
               sortable
               prop="xnsslnum"
               label="性能损失率排名"
-              width="75"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="xnssl"
               label="性能损失率(%)"
-              width="70"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="slsslnum"
               label="受累损失率排名"
-              width="70"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="slssl"
               label="受累损失率(%)"
-              width="70"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="fwjslnum"
               label="复位及时率排名"
-              width="70"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="fwjsl"
               label="复位及时率(%)"
-              width="70"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="ztzhjslnum"
               label="状态转换率排名"
-              width="70"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="ztzhjsl"
               label="状态转换率(%)"
-              width="70"
+              width="150"
             >
             </el-table-column>
             <el-table-column
-              fixed="right"
+              fixed="left"
               prop="address"
               label="操作"
-               width="70">
-               <template slot-scope="scope">
-                  <el-button size="mini"  @click="handleEdit(scope.$index, scope.row)">详情</el-button>
-               </template>
+              width="100"
+            >
+              <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-card>
-    
+
       <el-row
         style="
-          width: 100%;
-          height: 400px;
+          width: 96%;
+          height: 333px;
           display: flex;
           justify-content: space-between;
         "
       >
-          <div id="histogram" style="width: 80%; height: 300px"></div>
-        
+        <div id="histogram" style="width: 80%; height: 300px"></div>
       </el-row>
     </el-main>
   </el-container>
@@ -336,6 +340,7 @@
 <script>
 import * as echarts from "echarts";
 import formateDate from "@/utils/date";
+import formateDate1 from "@/utils/date_1";
 export default {
   data() {
     return {
@@ -343,8 +348,8 @@ export default {
         name: "",
         id: "",
       },
-      fdcName1:'',
-      fdcName2:'',
+      fdcName1: "",
+      fdcName2: "",
       date1: "2021-01-01",
       date2: "2020-01-03",
       wp_n_1: {},
@@ -358,39 +363,17 @@ export default {
         xnss: [],
         slss: [],
       },
-      wpId:[],
-      wpName:[],
-      lineDataOption:[],
+      wpId: [],
+      wpName: [],
+      lineDataOption: [],
       beginDate: "2021-01-01",
-      endDate: "2021-01-21",
+      endDate: "2021-01-03",
       fc: "MHS_FDC",
       tableData: [],
       dialogTableVisible: false,
       getChartDataValue: [],
       getChartDataValue2: [],
       getTableData: [],
-      gridData: [
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-      ],
     };
   },
   methods: {
@@ -403,16 +386,16 @@ export default {
       });
     },
     headStyle() {
-			    return "text-align:center"
-		    },
+      return "text-align:left";
+    },
     check_wpid() {
-      this.wp_n_1="";
-      this.wp_n_2="";
-      this.fdcName1="";
-      this.fdcName2="";
-      this.getChartDataValue=[];
-      this.getChartDataValue2=[];
-      this.getTableData=[];
+      this.wp_n_1 = "";
+      this.wp_n_2 = "";
+      this.fdcName1 = "";
+      this.fdcName2 = "";
+      this.getChartDataValue = [];
+      this.getChartDataValue2 = [];
+      this.getTableData = [];
       if (Object.keys(this.selectrowdate).length != 2) {
         this.alert_jg();
         return;
@@ -519,6 +502,9 @@ export default {
       this.selectrowdate = val;
     },
     query_fc() {
+       var newData = new Date();
+       this.beginDate = formateDate1(newData.getTime()/1000);
+       this.endDate = formateDate1(newData.getTime()/1000);
       this.$http.get("powercompare/windfarmAjax?").then((res) => {
         this.FClist = res.data.data;
       });
@@ -530,38 +516,40 @@ export default {
       });
       return;
     },
-    handleEdit(a,b){
+    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})
+      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,
+          });
         }
-        console.log(this.lineDataOption)
         this.$router.push({
-          path:'/YardBenchmark_particulars',
-          query:{
-            wpId:this.wpId,
-            beginDate:this.beginDate,
-            endDate:this.endDate,
-            wpName:this.wpName,
-            select:this.lineDataOption
-          }
-        })
-      }else{
-          console.log(b)
-          this.lineDataOption.push({id:b.wpId,name:b.wpName})
-          console.log(this.lineDataOption)
-          this.$router.push({
-          path:'/YardBenchmark_particulars',
-          query:{wpId:b.wpId,
-                beginDate:this.beginDate,
-                endDate:this.endDate,
-                wpName:b.wpName,
-                select:this.lineDataOption}
-          })
+          path: "/YardBenchmark_particulars",
+          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: "/YardBenchmark_particulars",
+          query: {
+            wpId: b.wpId,
+            beginDate: this.beginDate,
+            endDate: this.endDate,
+            wpName: b.wpName,
+            select: this.lineDataOption,
+          },
+        });
       }
     },
     query_benchmarkWpList() {
@@ -573,56 +561,26 @@ export default {
       page.append("endDate", this.endDate);
       this.$http.post("/contrast/benchmarkWpList", page).then((res) => {
         this.tableData = res.data.data;
-        console.log(this.tableData+"===");
         let len = this.tableData.length;
         for (let i = 0; i < len; i++) {
           that.histogram.date[i] = formateDate(
             new Date(res.data.data[i].recordDate) / 1000
           );
-          if (
-            res.data.data[i].xdss == null ||
-            res.data.data[i].xdss == undefined
-          ) {
-            that.histogram.xdss[i] = 0;
-          } else {
+          
             that.histogram.xdss[i] = res.data.data[i].xdss;
-          }
+          
 
-          if (
-            res.data.data[i].gzss == null ||
-            res.data.data[i].gzss == undefined
-          ) {
-            that.histogram.gzss[i] = 0;
-          } else {
+          
             that.histogram.gzss[i] = res.data.data[i].gzss;
-          }
+          
 
-          if (
-            res.data.data[i].jxss == null ||
-            res.data.data[i].jxss == undefined
-          ) {
-            that.histogram.jxss[i] = 0;
-          } else {
-            that.histogram.jxss[i] = res.data.data[i].jxss;
-          }
-
-          if (
-            res.data.data[i].xnss == null ||
-            res.data.data[i].xnss == undefined
-          ) {
-            that.histogram.xnss[i] = 0;
-          } else {
-            that.histogram.xnss[i] = res.data.data[i].xnss;
-          }
-
-          if (
-            res.data.data[i].slss == null ||
-            res.data.data[i].slss == undefined
-          ) {
-            that.histogram.slss[i] = 0;
-          } else {
+          
+            that.histogram.jxss[i] = res.data.data[i].whss;
+         
+            that.histogram.xnss[i] = res.data.data[i].qfss;
+          
             that.histogram.slss[i] = res.data.data[i].slss;
-          }
+          
         }
 
         this.drawhistogram();
@@ -882,19 +840,27 @@ export default {
   },
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
 .bg-purple-dark {
   background: #fff;
 }
+
 .grid-content {
   border-radius: 2px;
   min-height: 36px;
   margin-top: -15px;
 }
+/deep/::-webkit-scrollbar {
+  z-index: 99999999;
+  width: 6px;
+  height: 13px !important;
+  background-color: #f5f5f5;
+}
 .item {
   margin-top: 10px;
   margin-right: 40px;
 }
+
 .el-row {
   margin: 10px;
 }

src/views/NormRanking/GoodnessfitRank.vue

@@ -57,13 +57,14 @@
     </el-header>
 
     <el-main>
-      <el-card style="margin-top: 20px; height: 400px">
+      <el-card style=" height: 759px">
         <el-table
+          v-loading="loading"
           :data="tableData"
-          style="width: 100%; font-size: 1px"
+          style="width: 100%"
           :cell-style="{ textAlign: 'center' }"
           :header-cell-style="headStyle"
-          max-height="330px"
+          max-height="739px"
           @selection-change="changeFun"
         >
           >
@@ -136,6 +137,7 @@
 </template>
 <script>
 import formateDate from "@/utils/date";
+import formateDate1 from "@/utils/date_1";
 import * as echarts from "echarts";
 export default {
   data() {
@@ -144,10 +146,11 @@ export default {
         name: "",
         id: "",
       },
+      loading:true,
       tableData: [],
       dialogTableVisible: false,
       beginDate: "2021-01-01",
-      endDate: "2021-01-03",
+      endDate: "2021-01-01",
       fc: "MHS_FDC",
       selectrowdate: {},
       histogram_Date: [],
@@ -156,8 +159,11 @@ export default {
   },
   methods: {
     query_fc() {
-      this.$http.get("powercompare/windfarmAjax?").then((res) => {
-        this.FClist = res.data.data;
+       var newData = new Date();
+       this.beginDate = formateDate1(newData.getTime()/1000);
+       this.endDate = formateDate1(newData.getTime()/1000);
+       this.$http.get("powercompare/windfarmAjax?").then((res) => {
+       this.FClist = res.data.data;
       });
     },
     query_table() {
@@ -180,6 +186,7 @@ export default {
         )
         .then((res) => {
           this.tableData = res.data.data;
+          this.loading=false;
         });
     },
     headStyle() {
@@ -207,6 +214,7 @@ export default {
           let design = [];
           let h_Date = res.data.data;
           this.histogram_sers = res.data.data.sers;
+          
           for (let j = 0; j < Object.keys(this.histogram_sers).length; j++) {
             let name1 = res.data.data.sers[j];
             design = h_Date[name1];
@@ -274,8 +282,7 @@ export default {
         },
         xAxis: {
           type: "category",
-          boundaryGap: false,
-          data: [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,21,22,23,24,25,26],
+          data: [0.5,1.0,1.5,2.0,2.5,3.0,3.5,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,8.0,8.5,9.0,9.5,10.0,10.5,11.0,11.5,12.0,12.5,13.0,13.5,14.0,14.5,15.0,15.5,16.0,16.5,17.0,17.5,18.0,18.5,19.0,19.5,20.0,20.5,21.0,21.5,22.0,22.5,23.0,23.5,24.0,24.5,25.0],
         },
         yAxis: {
           type: "value",
@@ -288,6 +295,7 @@ export default {
   },
   mounted() {
     this.query_fc();
+    this.query_table();
   },
 };
 </script>

src/views/NormRanking/Grossgeneration_Rank.vue

@@ -70,14 +70,15 @@
     </el-header>
 
     <el-main>
-      <el-card style="margin-top: 20px; height: 666px">
+      <el-card style=" height: 759px">
         <el-table
+          v-loading="loading"
           id="tableData"
           :data="tableData"
-          style="width: 100%; font-size: 1px"
+          style="width: 100%"
           :cell-style="{ textAlign: 'center' }"
           :header-cell-style="headStyle"
-          max-height="666px"
+          max-height="739px"
           @selection-change="changeFun"
         >
           >
@@ -142,6 +143,7 @@
 
 <script>
 import formateDate from "@/utils/date";
+import formateDate1 from "@/utils/date_1";
 import excelHelper from "@/utils/excelHelper";
 export default {
   data() {
@@ -151,6 +153,7 @@ export default {
       GFlist: [
         
       ],
+      loading:true,
       QBlist: [
        
       ],
@@ -170,7 +173,7 @@ export default {
       ],
       tableData: [],
       beginDate: "2021-01-01",
-      endDate: "2021-01-03",
+      endDate: "2021-01-01",
       lx: "qb",
       fc: "",
       selectrowdate: {},
@@ -191,6 +194,9 @@ export default {
       }
     },
     query_fc() {
+       var newData = new Date();
+       this.beginDate = formateDate1(newData.getTime()/1000);
+       this.endDate = formateDate1(newData.getTime()/1000);
       let that = this;
       let fjj="";
       this.$http.get("powercompare/windfarmAllAjax?").then((res) => {
@@ -209,6 +215,8 @@ export default {
      });
     },
     query_table() {
+      this.loading=true;
+      this.tableData=[];
       this.$http
         .get(
           "leaderboard/totalPowerCapacityTopList?wpIps=" +
@@ -228,7 +236,7 @@ export default {
         )
         .then((res) => {
           this.tableData = res.data.data;
-          console.log(this.tableData);
+          this.loading=false;
         });
     },
     toExcel() {
@@ -260,6 +268,7 @@ export default {
   },
   mounted() {
     this.query_fc();
+    this.query_table();
   },
 };
 </script>

src/views/NormRanking/PercentageLossrRank.vue

@@ -73,13 +73,13 @@
     </el-header>
 
     <el-main>
-      <el-card style="margin-top: 20px; height: 400px">
+      <el-card style="height: 759px">
         <el-table
           :data="tableData"
-          style="width: 100%; font-size: 1px"
+          style="width: 100%"
           :cell-style="{ textAlign: 'center' }"
           :header-cell-style="headStyle"
-          max-height="330px"
+          max-height="739px"
           @selection-change="changeFun"
         >
           >
@@ -89,32 +89,32 @@
               type="selection"
               class="selection"
               @selection-change="changeFun"
-              width="190"
+              width="130"
             >
             </el-table-column>
-            <el-table-column sortable prop="windturbineid" label="名称" width="280">
+            <el-table-column sortable prop="windturbineid" label="名称" width="330">
             </el-table-column>
             <el-table-column
               sortable
               prop="daynhgzssdl2"
               label="非计划检修损失率(%)"
-              width="280"
+              width="330"
             >
             </el-table-column>
             <el-table-column
               sortable
               prop="daynhwhssdl2"
               label="计划检修损失率(%)"
-              width="280"
+              width="330"
             >
             </el-table-column>
-            <el-table-column sortable prop="daynhxdssdl2" label="弃风率(%)" width="180">
+            <el-table-column sortable prop="daynhxdssdl2" label="弃风率(%)" width="330">
             </el-table-column>
             <el-table-column
               sortable
               prop="dayspeed"
               label="受累损失率(%)"
-              width="280"
+              width="339"
             >
             </el-table-column>
           </el-table-column>
@@ -125,6 +125,8 @@
 </template>
 
 <script>
+import formateDate from "@/utils/date";
+import formateDate1 from "@/utils/date_1";
 export default {
   data() {
     return {
@@ -228,6 +230,9 @@ export default {
     },
   },
   mounted() {
+    var newData = new Date();
+    this.beginDate = formateDate1(newData.getTime()/1000);
+    this.endDate = formateDate1(newData.getTime()/1000);
     this.query_fc();
     this.query_table();
   },

src/views/Performance/PerformanceList.vue

@@ -477,6 +477,8 @@
 
 <script>
 import * as echarts from "echarts";
+import formateDate from "@/utils/date";
+import formateDate1 from "@/utils/date_1";
 import excelHelper from "@/utils/excelHelper";
 export default {
   data() {
@@ -489,6 +491,10 @@ export default {
       autoHeight_fc: 400,
       autoHeight_pj: 800,
       autoHeight_xl: 1200,
+      tableHeight_fc:'',
+      tableHeight_pj:'',
+      tableHeight_xl:'',
+      queryAll_table_lyl:[],
       wpIdslist: {
         name:"",
         id:"",
@@ -525,16 +531,31 @@ export default {
       },
       styleObject_xl: {
         height: '1220px'
+      },
+      linechar_data:{
+        dayspeed:[],
+        daydl2:[],
+        daynhgzssdl:[],
+        daynhcfdl:[],
+        daynhqfdl:[],
+        daynhxdssdl:[],
+        lyl:[],
+        wtName:[],
+        total:[],
       }
     };
   },
   methods: {
+    created(){
+      
+      },
     onSubmit() {},
     query_wpid() {
-      
-      this.$http.get("powercompare/windfarmAjax?").then((res) => {
-        this.wpIdslist = res.data.data;
-        
+       var newData = new Date();
+       this.beginDate = formateDate1(newData.getTime()/1000);
+       this.endDate = formateDate1(newData.getTime()/1000);
+       this.$http.get("powercompare/windfarmAjax?").then((res) => {
+       this.wpIdslist = res.data.data;
       });
     },
     query_xml(){
@@ -551,11 +572,6 @@ export default {
         this.linelist = res.data.data;
       });
     },
-    query_lyl(queryAll_table) {
-      Object.assign(this.$data.gridData, this.$options.data().gridData);
-      queryAll_table.splice(-1, 1);
-      this.gridData = queryAll_table;
-    },
     handleClick(tab) {
       if (tab.name === "first") {
         this.tableid = "fc";
@@ -578,6 +594,7 @@ export default {
       Object.assign(this.$data.styleObject_pj, this.$options.data().styleObject_pj);
       Object.assign(this.$data.autoHeight_xl, this.$options.data().autoHeight_xl);
       Object.assign(this.$data.styleObject_xl, this.$options.data().styleObject_xl);
+      Object.assign(this.$data.queryAll_table_lyl, this.$options.data().queryAll_table_lyl);
       this.styleObject_fc.height = '460px';
       this.autoHeight_fc = '400px';
       this.styleObject_pj.height = '860px';
@@ -587,27 +604,6 @@ export default {
       this.fc_date = "";
       this.xl_date = "";
       this.pj_date = "";
-      this.$http
-        .get(
-          "powercompare/queryPowerAll?wpIds=" +
-            this.fc +
-            "&beginDate=" +
-            this.beginDate +
-            "&endDate=" +
-            this.endDate +
-            "&queryType=" +
-            this.tableid
-        )
-        .then((res) => {
-          let that = this;
-          if (this.tableid === "fc") {
-            that.drawhistogram_fc(res.data.data);
-          } else if (this.tableid === "pj") {
-            that.drawhistogram_pj(res.data.data);
-          } else if (this.tableid === "xl") {
-            that.drawhistogram_xl(res.data.data);
-          }
-        });
       //表格数据获取
       this.$http
         .get(
@@ -626,20 +622,46 @@ export default {
         )
         .then((res) => {
           let that = this;
-          let queryAll_table = res.data.data;
-          this.query_lyl(queryAll_table);
+          Object.assign(this.$data.linechar_data, this.$options.data().linechar_data);
+          this.linechar_data.dayspeed=[];
+          this.linechar_data.daydl2=[];
+          this.linechar_data.daynhgzssdl=[];
+          this.linechar_data.daynhcfdl=[];
+          this.linechar_data.daynhqfdl=[];
+          this.linechar_data.daynhxdssdl=[];
+          this.linechar_data.lyl=[];
+          this.linechar_data.wtName=[];
+          let queryAll_table = res.data.data.list;
+          let queryAll_table_lyl = res.data.data.lyl;
+          for(let i = 0;i < Object.keys(queryAll_table).length;i++){
+            if(queryAll_table[i].wtName!="合计"){
+            that.linechar_data.dayspeed.push(queryAll_table[i].dayspeed.toFixed(2));
+            that.linechar_data.daydl2.push(queryAll_table[i].daydl2.toFixed(2));
+            that.linechar_data.daynhgzssdl.push(queryAll_table[i].daynhgzssdl.toFixed(2));
+            that.linechar_data.daynhcfdl.push(queryAll_table[i].daynhcfdl.toFixed(2));
+            that.linechar_data.daynhqfdl.push(queryAll_table[i].daynhqfdl.toFixed(2));
+            that.linechar_data.daynhxdssdl.push(queryAll_table[i].daynhxdssdl.toFixed(2));
+            that.linechar_data.lyl.push(queryAll_table[i].lyl.toFixed(2));
+            that.linechar_data.wtName.push(queryAll_table[i].wtName);
+            that.linechar_data.total.push(queryAll_table[i].total.toFixed(2));
+            }
+          }
           if (this.tableid === "fc") {
             that.fc_date = queryAll_table;
+            that.drawhistogram_fc(this.linechar_data,queryAll_table_lyl);
           } else if (this.tableid === "pj") {
             that.pj_date = queryAll_table;
+            that.drawhistogram_pj(this.linechar_data,queryAll_table_lyl);
           } else if (this.tableid === "xl") {
             that.xl_date = queryAll_table;
+            that.drawhistogram_xl(this.linechar_data,queryAll_table_lyl);
           }
         });
     },
     async queryPowerAll() {
       Object.assign(this.$data.autoHeight_fc, this.$options.data().autoHeight_fc);
       Object.assign(this.$data.styleObject_fc, this.$options.data().styleObject_fc);
+      Object.assign(this.$data.linechar_data, this.$options.data().linechar_data);
       let that = this;
       if (
         this.beginDate == "" ||
@@ -663,9 +685,39 @@ export default {
       ) {
         that.query();
       } else {
+        // this.$http
+        //   .get(
+        //     "powercompare/queryPower?wpIds=" +
+        //       this.fc +
+        //       "&pjIds=" +
+        //       this.pj +
+        //       "&lineIds=" +
+        //       this.xl +
+        //       "&beginDate=" +
+        //       this.beginDate +
+        //       "&endDate=" +
+        //       this.endDate
+        //   )
+          // .then((res) => {
+          //   let that = this;
+            // let queryAll = res.data.data;
+            // this.len = Object.keys(queryAll.names).length;
+            // if(this.len <= 10){that.autoHeight_fc = 575; that.styleObject_fc.height = '700px' }
+            // else if(this.len > 10 && this.len <=20){that.autoHeight_fc = 775; that.styleObject_fc.height = '800px';that.autoHeight_pj = 775; that.styleObject_pj.height = '800px';that.autoHeight_xl = 775; that.styleObject_xl.height = '800px' }
+            // else if(this.len > 20 && this.len <=30){that.autoHeight_fc = 975; that.styleObject_fc.height = '1000px';that.autoHeight_pj = 975; that.styleObject_pj.height = '1000px';that.autoHeight_xl = 975; that.styleObject_xl.height = '1000px' }
+            // else if(this.len > 30 && this.len <=40){that.autoHeight_fc = 1175; that.styleObject_fc.height = '1200px';that.autoHeight_pj = 1175; that.styleObject_pj.height = '1200px';that.autoHeight_xl = 1175; that.styleObject_xl.height = '1200px' }
+            // else if(this.len > 40 && this.len <=50){that.autoHeight_fc = 1375; that.styleObject_fc.height = '1400px';that.autoHeight_pj = 1375; that.styleObject_pj.height = '1400px';that.autoHeight_xl = 1375; that.styleObject_xl.height = '1400px' }
+            // else if(this.len > 50 && this.len <=60){that.autoHeight_fc = 1575; that.styleObject_fc.height = '1600px';that.autoHeight_pj = 1575; that.styleObject_pj.height = '1600px';that.autoHeight_xl = 1575; that.styleObject_xl.height = '1600px' }
+            // else if(this.len > 60 && this.len <=70){that.autoHeight_fc = 1775; that.styleObject_fc.height = '1800px';that.autoHeight_pj = 1775; that.styleObject_pj.height = '1800px';that.autoHeight_xl = 1775; that.styleObject_xl.height = '1800px' }
+            // else if(this.len > 70 && this.len <=80){that.autoHeight_fc = 1975; that.styleObject_fc.height = '2000px';that.autoHeight_pj = 1975; that.styleObject_pj.height = '2000px';that.autoHeight_xl = 1975; that.styleObject_xl.height = '2000px' }
+            // else{that.autoHeight_fc = 2175; that.styleObject_fc.height = '2200px';that.autoHeight_pj = 2175; that.styleObject_pj.height = '2200px';that.autoHeight_xl = 2175; that.styleObject_xl.height = '2200px' }
+            //  this.tableHeight_fc = this.autoHeight_fc - 20; 
+            //  this.tableHeight_pj = this.autoHeight_pj - 20; 
+            //  this.tableHeight_xl = this.autoHeight_xl - 20; 
+          //});
         this.$http
           .get(
-            "powercompare/queryPower?wpIds=" +
+            "powercompare/powerAjax?wpIds=" +
               this.fc +
               "&pjIds=" +
               this.pj +
@@ -674,13 +726,15 @@ export default {
               "&beginDate=" +
               this.beginDate +
               "&endDate=" +
-              this.endDate
+              this.endDate +
+              "&sortName=" +
+              this.fc +
+              "&sortOrder=" +
+              "Asc"
           )
           .then((res) => {
             let that = this;
-            let queryAll = res.data.data;
-            this.len = Object.keys(queryAll.names).length;
-
+            this.len = Object.keys(res.data.data.list).length;
             if(this.len <= 10){that.autoHeight_fc = 575; that.styleObject_fc.height = '700px' }
             else if(this.len > 10 && this.len <=20){that.autoHeight_fc = 775; that.styleObject_fc.height = '800px';that.autoHeight_pj = 775; that.styleObject_pj.height = '800px';that.autoHeight_xl = 775; that.styleObject_xl.height = '800px' }
             else if(this.len > 20 && this.len <=30){that.autoHeight_fc = 975; that.styleObject_fc.height = '1000px';that.autoHeight_pj = 975; that.styleObject_pj.height = '1000px';that.autoHeight_xl = 975; that.styleObject_xl.height = '1000px' }
@@ -690,45 +744,45 @@ export default {
             else if(this.len > 60 && this.len <=70){that.autoHeight_fc = 1775; that.styleObject_fc.height = '1800px';that.autoHeight_pj = 1775; that.styleObject_pj.height = '1800px';that.autoHeight_xl = 1775; that.styleObject_xl.height = '1800px' }
             else if(this.len > 70 && this.len <=80){that.autoHeight_fc = 1975; that.styleObject_fc.height = '2000px';that.autoHeight_pj = 1975; that.styleObject_pj.height = '2000px';that.autoHeight_xl = 1975; that.styleObject_xl.height = '2000px' }
             else{that.autoHeight_fc = 2175; that.styleObject_fc.height = '2200px';that.autoHeight_pj = 2175; that.styleObject_pj.height = '2200px';that.autoHeight_xl = 2175; that.styleObject_xl.height = '2200px' }
-
-            if (this.tableid === "fc") {
-              that.drawhistogram_fc(queryAll);
-            } else if (this.tableid === "pj") {
-              that.drawhistogram_pj(queryAll);
-            } else if (this.tableid === "xl") {
-              that.drawhistogram_xl(queryAll);
-            }
              this.tableHeight_fc = this.autoHeight_fc - 20; 
              this.tableHeight_pj = this.autoHeight_pj - 20; 
              this.tableHeight_xl = this.autoHeight_xl - 20; 
-          });
-        this.$http
-          .get(
-            "powercompare/powerAjax?wpIds=" +
-              this.fc +
-              "&pjIds=" +
-              this.pj +
-              "&lineIds=" +
-              this.xl +
-              "&beginDate=" +
-              this.beginDate +
-              "&endDate=" +
-              this.endDate +
-              "&sortName=" +
-              this.fc +
-              "&sortOrder=" +
-              "Asc"
-          )
-          .then((res) => {
-            let that = this;
-            let queryAll_table = res.data.data;
-            if (this.tableid === "fc") {
-              that.fc_date = queryAll_table;
-            } else if (this.tableid === "pj") {
-              that.pj_date = queryAll_table;
-            } else if (this.tableid === "xl") {
-              that.xl_date = queryAll_table;
+          Object.assign(this.$data.linechar_data, this.$options.data().linechar_data);
+          this.linechar_data.dayspeed=[];
+          this.linechar_data.daydl2=[];
+          this.linechar_data.daynhgzssdl=[];
+          this.linechar_data.daynhcfdl=[];
+          this.linechar_data.daynhqfdl=[];
+          this.linechar_data.daynhxdssdl=[];
+          this.linechar_data.lyl=[];
+          this.linechar_data.wtName=[];
+          let queryAll_table = res.data.data.list;
+          let queryAll_table_lyl = res.data.data.lyl;
+          //this.query_lyl(queryAll_table);
+          for(let i = 0;i < Object.keys(queryAll_table).length;i++){
+            if(queryAll_table[i].wtName!="合计"){
+            that.linechar_data.dayspeed.push(queryAll_table[i].dayspeed.toFixed(2));
+            that.linechar_data.daydl2.push(queryAll_table[i].daydl2.toFixed(2));
+            that.linechar_data.daynhgzssdl.push(queryAll_table[i].daynhgzssdl.toFixed(2));
+            that.linechar_data.daynhcfdl.push(queryAll_table[i].daynhcfdl.toFixed(2));
+            that.linechar_data.daynhqfdl.push(queryAll_table[i].daynhqfdl.toFixed(2));
+            that.linechar_data.daynhxdssdl.push(queryAll_table[i].daynhxdssdl.toFixed(2));
+            that.linechar_data.lyl.push(queryAll_table[i].lyl.toFixed(2));
+            that.linechar_data.wtName.push(queryAll_table[i].wtName);
+            that.linechar_data.total.push(queryAll_table[i].total.toFixed(2));
             }
+            
+          }
+           if (this.tableid === "fc") {
+            that.fc_date = queryAll_table;
+            that.drawhistogram_fc(this.linechar_data,queryAll_table_lyl);
+          } else if (this.tableid === "pj") {
+            that.pj_date = queryAll_table;
+            that.drawhistogram_pj(this.linechar_data,queryAll_table_lyl);
+          } else if (this.tableid === "xl") {
+            that.xl_date = queryAll_table;
+            that.drawhistogram_xl(this.linechar_data,queryAll_table_lyl);
+          }
           });
       }
     },
@@ -792,7 +846,7 @@ export default {
         excelHelper.exportExcel("xl_table", "xl数据", ".xls", true);
       }
     },
-    drawhistogram_fc(date) {
+    drawhistogram_fc(date,date2) {
       this.chartLine = echarts.init(document.getElementById("histogram_fc"));
       this.chartLine.clear();
       this.chartLine.resize({ height: this.autoHeight_fc });
@@ -832,7 +886,7 @@ export default {
             "限电损失",
             "受累损失",
             "性能损失",
-            "总和",
+            "-",
           ],
         },
         grid: {
@@ -846,7 +900,7 @@ export default {
         },
         yAxis: {
           type: "category",
-          data: date.names,
+          data: date.wtName,
         },
         series: [
           {
@@ -859,7 +913,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.sfdl,
+            data: date.daydl2,
           },
           {
             name: "计划检修损失",
@@ -871,7 +925,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.whdl,
+            data: date.daynhwhssdl,
           },
           {
             name: "非计划检修损失",
@@ -883,7 +937,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.gzdl,
+            data: date.daynhgzssdl,
           },
           {
             name: "限电损失",
@@ -895,7 +949,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.xddl,
+            data: date.daynhxdssdl,
           },
           {
             name: "受累损失",
@@ -907,24 +961,27 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.sldl,
+            data: date.daynhcfdl,
           },
           {
             name: "性能损失",
             type: "bar",
             stack: "total",
             label: {
-              show: date.qfdl,
+              show: true,
             },
             emphasis: {
               focus: "series",
             },
-            data: date.qfdl,
+            data: date.daynhxdssdl,
           },
           //曲线
           {
-            name: "总和",
-            data: date.yfdl,
+            name: "-",
+            data: date.total,
+            markPoint: {
+                data: date2,
+                        },
             type: "line",
             symbol: "circle",
             symbolSize: 20,
@@ -943,7 +1000,7 @@ export default {
       };
       this.chartLine.setOption(option);
     },
-    drawhistogram_pj(date) {
+    drawhistogram_pj(date,date2) {
       this.chartLine = echarts.init(document.getElementById("histogram_xm"));
       this.chartLine.clear();
       this.chartLine.resize({ height: this.autoHeight_pj });
@@ -985,7 +1042,7 @@ export default {
             "限电损失",
             "受累损失",
             "性能损失",
-            "总和",
+            "-",
           ],
         },
         grid: {
@@ -999,7 +1056,7 @@ export default {
         },
         yAxis: {
           type: "category",
-          data: date.names,
+          data: date.wtName,
         },
         series: [
           {
@@ -1012,7 +1069,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.sfdl,
+            data: date.daydl2,
           },
           {
             name: "计划检修损失",
@@ -1024,7 +1081,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.whdl,
+            data: date.daynhwhssdl,
           },
           {
             name: "非计划检修损失",
@@ -1036,7 +1093,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.gzdl,
+            data: date.daynhgzssdl,
           },
           {
             name: "限电损失",
@@ -1048,7 +1105,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.xddl,
+            data: date.daynhxdssdl,
           },
           {
             name: "受累损失",
@@ -1060,24 +1117,27 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.sldl,
+            data: date.daynhcfdl,
           },
           {
             name: "性能损失",
             type: "bar",
             stack: "total",
             label: {
-              show: date.qfdl,
+              show: true,
             },
             emphasis: {
               focus: "series",
             },
-            data: date.qfdl,
+            data: date.daynhxdssdl,
           },
           //曲线
           {
-            name: "总和",
-            data: date.yfdl,
+            name: "-",
+            data: date.total,
+            markPoint: {
+                data: date2,
+                        },
             type: "line",
             symbol: "circle",
             symbolSize: 20,
@@ -1096,7 +1156,7 @@ export default {
       };
       this.chartLine.setOption(option);
     },
-    drawhistogram_xl(date) {
+    drawhistogram_xl(date,date2) {
       this.chartLine = echarts.init(document.getElementById("histogram_jdxl"));
       this.chartLine.clear();
       this.chartLine.resize({ height: this.autoHeight_xl });
@@ -1137,7 +1197,7 @@ export default {
             "限电损失",
             "受累损失",
             "性能损失",
-            "总和",
+            "-",
           ],
         },
         grid: {
@@ -1151,7 +1211,7 @@ export default {
         },
         yAxis: {
           type: "category",
-          data: date.names,
+          data: date.wtName,
         },
         series: [
           {
@@ -1164,7 +1224,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.sfdl,
+            data: date.daydl2,
           },
           {
             name: "计划检修损失",
@@ -1176,7 +1236,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.whdl,
+            data: date.daynhwhssdl,
           },
           {
             name: "非计划检修损失",
@@ -1188,7 +1248,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.gzdl,
+            data: date.daynhgzssdl,
           },
           {
             name: "限电损失",
@@ -1200,7 +1260,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.xddl,
+            data: date.daynhxdssdl,
           },
           {
             name: "受累损失",
@@ -1212,24 +1272,27 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.sldl,
+            data: date.daynhcfdl,
           },
           {
             name: "性能损失",
             type: "bar",
             stack: "total",
             label: {
-              show: date.qfdl,
+              show: true,
             },
             emphasis: {
               focus: "series",
             },
-            data: date.qfdl,
+            data: date.daynhxdssdl,
           },
           //曲线
           {
-            name: "总和",
-            data: date.yfdl,
+            name: "-",
+            data: date.total,
+            markPoint: {
+                data: date2,
+                        },
             type: "line",
             symbol: "circle",
             symbolSize: 20,
@@ -1254,6 +1317,7 @@ export default {
                
             //后面的50：根据需求空出的高度，自行调整
         });
+       
     this.query_wpid();
     this.query();
   },

src/views/ProjectBenchmark/ProjectBenchmark.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div class="searchBar">
-      <el-form :inline="true" class="demo-form-inline">
+      <el-form :inline="true" class="demo-form-inline" style="margin-left:1%">
         <el-row :gutter="1">
           <el-form-item label="风场">
               <el-select v-model="fc" clearable placeholder="请选择" @change="query_xml()">
@@ -46,22 +46,24 @@
           </el-form-item>
 
           <el-form-item>
-            <el-button type="primary" @click="queryApDataMx"
+            <el-button type="primary" @click="querycheck"
               >对标分析</el-button
             >
           </el-form-item>
         </el-row>
       </el-form>
       <el-table
+        v-loading="loading"
         :data="gridData"
         :row-style="{ height: '10px' }"
-        :cell-style="{ textAlign: 'center', padding: '1px' }"
+        :cell-style="{ textAlign: 'center'}"
         :header-cell-style="headStyle"
         @selection-change="handleSelectionChange"
         @sort-change="changeTableSort"
-        style="font-size: 10px"
+        max-height="388px"
+        style="margin-bottom:30px"
       >
-        <el-table-column label="场外对标列表">
+        <el-table-column label="项目对标列表">
           <el-table-column type="index" width="50"> </el-table-column>
           <el-table-column
             type="selection"
@@ -70,166 +72,166 @@
             width="50"
           >
           </el-table-column>
-          <el-table-column sortable prop="wpName" label="风电场名称" width="90">
+          <el-table-column sortable prop="wpName" label="风电场名称" width="130">
           </el-table-column>
-          <el-table-column sortable prop="pjName" label="项目名称" width="110">
+          <el-table-column sortable prop="pjName" label="项目名称" width="150">
           </el-table-column>
-          <el-table-column sortable prop="ordernum" label="综合排名" width="60">
+          <el-table-column sortable prop="ordernum" label="综合排名" width="110">
           </el-table-column>
           <el-table-column
             sortable
             prop="scadafdlnum"
             label="发电量排名"
-            width="70"
+            width="130"
           >
           </el-table-column>
-          <el-table-column sortable prop="fdl" :formatter="filter_fdl" label="发电量" width="90">
+          <el-table-column sortable prop="fdl" :formatter="filter_fdl" label="发电量" width="110">
           </el-table-column>
           <el-table-column
             sortable
             prop="gzssnum"
-            label="故障损失电量排名"
-            width="80"
+            label="故障损失排名"
+            width="150"
           >
           </el-table-column>
-          <el-table-column sortable prop="gzss" label="故障损失电量" width="70">
+          <el-table-column sortable prop="gzss" label="故障损失" width="130">
           </el-table-column>
           <el-table-column
             sortable
             prop="whssnum"
-            label="检修损失电量排名"
-            width="75"
+            label="检修损失排名"
+            width="139"
           >
           </el-table-column>
-          <el-table-column sortable prop="whss" label="检修损失电量" width="70">
+          <el-table-column sortable prop="whss" label="检修损失" width="130">
           </el-table-column>
           <el-table-column
             sortable
             prop="qfssnum"
-            label="性能损失电量排名"
-            width="75"
+            label="性能损失排名"
+            width="139"
           >
           </el-table-column>
-          <el-table-column sortable prop="qfss" label="性能损失电量" width="70">
+          <el-table-column sortable prop="qfss" label="性能损失" width="110">
           </el-table-column>
           <el-table-column
             sortable
             prop="xdssnum"
-            label="限电损失电量排名"
-            width="75"
+            label="限电损失排名"
+            width="130"
           >
           </el-table-column>
-          <el-table-column sortable prop="xdss" label="限电损失电量" width="70">
+          <el-table-column sortable prop="xdss" label="限电损失" width="110">
           </el-table-column>
           <el-table-column
             sortable
             prop="slssnum"
-            label="受累损失电量排名"
-            width="75"
+            label="受累损失排名"
+            width="150"
           >
           </el-table-column>
-          <el-table-column sortable prop="slss" label="受累损失电量" width="70">
+          <el-table-column sortable prop="slss" label="受累损失" width="110">
           </el-table-column>
           <el-table-column
             sortable
             prop="fnlylnum"
             label="风能利用率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="fnlyl"
             label="风能利用率(%)"
-            width="80"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="gzsslnum"
             label="故障损失率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="gzssl"
             label="故障损失率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="jxsslnum"
             label="检修损失率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="jxssl"
             label="检修损失率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
-          <el-table-column sortable prop="qflnum" label="弃风率排名" width="70">
+          <el-table-column sortable prop="qflnum" label="弃风率排名" width="130">
           </el-table-column>
-          <el-table-column sortable prop="qfl" label="弃风率(%)" width="65">
+          <el-table-column sortable prop="qfl" label="弃风率(%)" width="130">
           </el-table-column>
           <el-table-column
             sortable
             prop="xnsslnum"
             label="性能损失率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="xnssl"
             label="性能损失率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="slsslnum"
             label="受累损失率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="slssl"
             label="受累损失率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="fwjslnum"
             label="复位及时率排名"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="fwjsl"
             label="复位及时率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="ztzhjslnum"
             label="状态转换率排名"
-            width="80"
+            width="150"
           >
           </el-table-column>
           <el-table-column
             sortable
             prop="ztzhjsl"
             label="状态转换率(%)"
-            width="75"
+            width="150"
           >
           </el-table-column>
           <el-table-column fixed="right" prop="address" label="操作" width="70">
@@ -311,6 +313,7 @@
 <script>
 import FiveLossRatesHistogramChart from "../../views/benchMarking/FiveLossRatesHistogramChart.vue";
 import formateDate from "@/utils/date";
+import formateDate1 from "@/utils/date_1";
 import * as echarts from "echarts";
 export default {
   data() {
@@ -321,8 +324,6 @@ export default {
         line: "",
       },
       timedate: [
-        // {beginDate:'2021-01-01'},
-        // {endDate:'2021-01-04'}
       ],
       pj:'',
       fc:'',
@@ -371,6 +372,7 @@ export default {
           label: "香山风电场",
         },
       ],
+      loading:true,
       value: "",
       pjId: [],
       pjName: [],
@@ -406,7 +408,7 @@ export default {
       });
     },
     headStyle() {
-      return "text-align:center";
+      return "text-align:left";
     },
     onSubmit() {
       console.log("submit!");
@@ -416,7 +418,9 @@ export default {
       rows.splice(index, 1);
     },
     query_wpid() {
-      
+      var newData = new Date();
+       this.timedate[0] = formateDate1(newData.getTime()/1000);
+       this.timedate[1] = formateDate1(newData.getTime()/1000);
       this.$http.get("powercompare/windfarmAjax?").then((res) => {
         this.wpIdslist = res.data.data;
         
@@ -442,6 +446,7 @@ export default {
         this.$router.push({
           path: "/benchmark_project_particulars",
           query: {
+            date:b,
             pjId: this.pjId,
             beginDate: this.beginDate,
             endDate: this.endDate,
@@ -462,8 +467,8 @@ export default {
             endDate: this.endDate,
             pjName: b.pjName,
             select: this.lineDataOption,
-            wtId:b.wtId,
-            wtName:b.wtName,
+            wtId:b.wpId,
+            wtName:b.wpName,
           },
         });
       }
@@ -487,6 +492,17 @@ export default {
         return;
       }
     },
+    querycheck(){
+      if(this.multipleSelection.length == 2){
+        this.queryApDataMx();
+      }else{
+        this.$message({
+          message:"请选择两个项目！",
+          type:'error'
+        });
+        return
+      }
+    },
     queryApDataMx() {
       this.dialogTableVisible = true;
       this.$nextTick(function () {
@@ -649,6 +665,7 @@ export default {
         .post("/contrast/benchmarkPjList", fiveLossData)
         .then((res) => {
           that.gridData = res.data.data;
+          that.loading=false;
           that.getPackageData(that.gridData);
           that.getPackageData2(that.gridData);
         });
@@ -968,6 +985,12 @@ export default {
   align-items: center;
   overflow: hidden;
 }
+/deep/::-webkit-scrollbar {
+  z-index: 99999999;
+  width: 6px;
+  height: 13px !important;
+  background-color: #f5f5f5;
+}
 .searchBar {
   margin-top: 1%;
 }

src/views/ProjectBenchmark/ProjectBenchmark_particulars.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div class="searchBar">
-      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form :inline="true"  class="demo-form-inline" style="margin-left:1%">
         <el-row :gutter="1">
           <!-- <el-form-item label="风场一">
               <el-select v-model="value"  multiple placeholder="请选择">
@@ -99,7 +99,7 @@
             >
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="queryApDataMx"
+            <el-button type="primary" @click="querycheck"
               >对标分析</el-button
             >
           </el-form-item>
@@ -110,39 +110,38 @@
       </el-form>
       <el-card>
         <el-table
+           v-loading="loading"
           :data="fdcLineData"
           :row-style="{ height: '10px' }"
-          :cell-style="{ textAlign: 'center', padding: '1px' }"
+          :cell-style="{ textAlign: 'center'}"
           :header-cell-style="headStyle"
           @selection-change="handleSelectionChange"
           @sort-change="changeTableSort"
-          style="font-size: 10px; margin-bottom: 100px; widht: 100%"
+          max-height="399px"
+          style="widht: 100%"
         >
-          <el-table-column label="场际对标列表一">
+          <el-table-column label="风机对标列表明细一">
             <el-table-column fixed type="index" width="45"> </el-table-column>
             <el-table-column type="selection" width="45"> </el-table-column>
-            <el-table-column prop="pjName" label="风机名称" width="110">
+
+            <el-table-column prop="wpName" label="风机名称" width="110">
             </el-table-column>
-            <el-table-column
-              sortable
-              :formatter="filter_date"
-              prop="recordDate"
-              label="日期"
-              width="80"
-            >
+
+            <el-table-column prop="pjName" label="风机名称" width="150">
             </el-table-column>
+            
             <el-table-column
               :sortable="'custom'"
               prop="ordernum"
               label="排名"
-              width="50"
+              width="90"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="scadafdlnum"
               label="发电量排名"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
@@ -150,21 +149,21 @@
               prop="scadafdl"
               :formatter="filter_fdl"
               label="发电量"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzssnum"
               label="故障排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzss"
               label="故障损失"
-              width="70"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.gzss | rounding }}</span>
@@ -174,14 +173,14 @@
               :sortable="'custom'"
               prop="whssnum"
               label="检修排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="whss"
               label="检修损失"
-              width="80"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.whss | rounding }}</span>
@@ -191,14 +190,14 @@
               :sortable="'custom'"
               prop="qfssnum"
               label="性能排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qfss"
               label="性能损失"
-              width="80"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.qfss | rounding }}</span>
@@ -208,14 +207,14 @@
               :sortable="'custom'"
               prop="xdssnum"
               label="限电排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xdss"
               label="限电损失"
-              width="70"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.xdss | rounding }}</span>
@@ -225,112 +224,112 @@
               :sortable="'custom'"
               prop="slssnum"
               label="受累排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slss"
               label="受累损失"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="fnlyl"
               label="风能利用率"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzsslnum"
               label="故障损失率排名"
-              width="90"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzssl"
               label="故障损失率"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="jxsslnum"
               label="检修损失率排名"
-              width="90"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="jxssl"
               label="检修损失率"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qflnum"
               label="弃风率排名"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qfl"
               label="弃风率"
-              width="60"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xnsslnum"
               label="性能损失率排名"
-              width="85"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xnssl"
               label="性能损失率"
-              width="81"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slsslnum"
               label="受累损失率排名"
-              width="81"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slssl"
               label="受累损失率"
-              width="81"
+              width="139"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="fwjsl"
               label="复位及时率"
-              width="81"
+              width="139"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xqjsl"
               label="消缺及时率"
-              width="81"
+              width="139"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="ztzhjsl"
               label="状态转换率"
-              width="81"
+              width="139"
             >
             </el-table-column>
           </el-table-column>
@@ -339,40 +338,39 @@
 
       <el-card>
         <el-table
+          v-loading="loading2"
           :data="fdcLineData2"
           :row-style="{ height: '10px' }"
-          :cell-style="{ textAlign: 'center', padding: '1px' }"
+          :cell-style="{ textAlign: 'center'}"
           :header-cell-style="headStyle"
           @selection-change="handleSelectionChange2"
           @sort-change="changeTableSort"
-          style="font-size: 10px; margin-bottom: 100px; widht: 100%"
+          style="widht: 100%"
+          max-height="399px"
           v-if="tb2"
         >
-          <el-table-column label="场际对标列表二">
+          <el-table-column label="风机对标列表明细二">
             <el-table-column fixed type="index" width="45"> </el-table-column>
             <el-table-column type="selection" width="45"> </el-table-column>
-            <el-table-column prop="pjName" label="风机名称" width="110">
+
+            <el-table-column prop="wpName" label="风机名称" width="110">
             </el-table-column>
-            <el-table-column
-              sortable
-              :formatter="filter_date"
-              prop="recordDate"
-              label="日期"
-              width="80"
-            >
+
+            <el-table-column prop="pjName" label="风机名称" width="150">
             </el-table-column>
+            
             <el-table-column
               :sortable="'custom'"
               prop="ordernum"
               label="排名"
-              width="50"
+              width="90"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="scadafdlnum"
               label="发电量排名"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
@@ -380,21 +378,21 @@
               prop="scadafdl"
               :formatter="filter_fdl"
               label="发电量"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzssnum"
               label="故障排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzss"
               label="故障损失"
-              width="70"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.gzss | rounding }}</span>
@@ -404,14 +402,14 @@
               :sortable="'custom'"
               prop="whssnum"
               label="检修排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="whss"
               label="检修损失"
-              width="80"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.whss | rounding }}</span>
@@ -421,14 +419,14 @@
               :sortable="'custom'"
               prop="qfssnum"
               label="性能排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qfss"
               label="性能损失"
-              width="80"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.qfss | rounding }}</span>
@@ -438,14 +436,14 @@
               :sortable="'custom'"
               prop="xdssnum"
               label="限电排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xdss"
               label="限电损失"
-              width="70"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.xdss | rounding }}</span>
@@ -455,112 +453,112 @@
               :sortable="'custom'"
               prop="slssnum"
               label="受累排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slss"
               label="受累损失"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="fnlyl"
               label="风能利用率"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzsslnum"
               label="故障损失率排名"
-              width="90"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzssl"
               label="故障损失率"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="jxsslnum"
               label="检修损失率排名"
-              width="90"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="jxssl"
               label="检修损失率"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qflnum"
               label="弃风率排名"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qfl"
               label="弃风率"
-              width="60"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xnsslnum"
               label="性能损失率排名"
-              width="85"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xnssl"
               label="性能损失率"
-              width="81"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slsslnum"
               label="受累损失率排名"
-              width="81"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slssl"
               label="受累损失率"
-              width="81"
+              width="139"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="fwjsl"
               label="复位及时率"
-              width="81"
+              width="139"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xqjsl"
               label="消缺及时率"
-              width="81"
+              width="139"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="ztzhjsl"
               label="状态转换率"
-              width="81"
+              width="139"
             >
             </el-table-column>
           </el-table-column>
@@ -604,55 +602,9 @@ export default {
   data() {
     return {
       tb2: false,
-      formInline: {
-        windfarm: "",
-        project: "",
-        line: "",
-      },
-      tableData: [
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1517 弄",
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1519 弄",
-        },
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1516 弄",
-        },
-      ],
-      options: [
-        {
-          value: "MHS_FDC",
-          label: "麻黄山风电场",
-        },
-        {
-          value: "NSS_FDC",
-          label: "牛首山风电场",
-        },
-        {
-          value: "SBQ_FDC",
-          label: "石板泉风电场",
-        },
-        {
-          value: "QS_FDC",
-          label: "青山风电场",
-        },
-        {
-          value: "XS_FDC",
-          label: "香山风电场",
-        },
-      ],
+      options: [],
+      loading:true,
+      loading2:true,
       fc: "",
       fc2: "",
       pj: "",
@@ -701,7 +653,12 @@ export default {
     },
   },
   created() {
+    this.timedate[0] = this.$route.query.beginDate;
+    this.timedate[1] = this.$route.query.endDate;
+    this.fc = this.$route.query.wtId;
+    this.pj = this.$route.query.pjId;
     this.query_wpid();
+    this.query_xml();
     this.YardTableData();
   },
   methods: {
@@ -727,23 +684,24 @@ export default {
         guilty.append("endDate", this.endDate);
         this.$http.post("/contrast/benchmarkPjList", guilty).then((res) => {
           this.fdcLineData2 = res.data.data;
+          this.loading2=false;
         });
       }
     },
+    querycheck(){
+      if(this.multipleSelection1.length + this.multipleSelection2.length ==2){
+        this.queryApDataMx();
+      }else{
+        this.$message({
+          message:"请选择两个项目！",
+          type:'error'
+        });
+        return
+      }
+    },
     queryApDataMx() {
       this.dialogTableVisible = true;
-      if (
-        this.multipleSelection1.length + this.multipleSelection2.length ==
-        2
-      ) {
-        this.multipleSelection = this.multipleSelection1.concat(
-          this.multipleSelection2
-        );
-      } else {
-        this.$message.error("请选两个风场！");
-        return;
-      }
-      if (this.multipleSelection.length == 2) {
+        this.multipleSelection = this.multipleSelection1.concat(this.multipleSelection2);
         this.pjName1 = this.multipleSelection[0].pjName;
         this.pjName2 = this.multipleSelection[1].pjName;
         this.fdcND1 =
@@ -857,7 +815,7 @@ export default {
           data1: this.multipleSelection[0].ztzhjsl,
           data2: this.multipleSelection[1].ztzhjsl,
         });
-      }
+      
       this.$nextTick(function () {
         this.drawPie("leiDaTu3");
       });
@@ -900,6 +858,7 @@ export default {
       guilty.append("endDate", this.endDate);
       this.$http.post("/contrast/benchmarkPjList", guilty).then((res) => {
         this.fdcLineData = res.data.data;
+        this.loading=false;
       });
     },
     query_xml() {
@@ -926,7 +885,7 @@ export default {
       });
     },
     headStyle() {
-      return "text-align:center";
+      return "text-align:left";
     },
     handleSelectionChange(val) {
       this.sortInOrder = [];
@@ -1128,6 +1087,12 @@ export default {
   width: 450px;
   float: left;
 }
+/deep/::-webkit-scrollbar {
+  z-index: 99999999;
+  width: 6px;
+  height: 13px !important;
+  background-color: #f5f5f5;
+}
 .margin {
   width: 100%;
   height: 618px;

src/views/PropertyBenchnark/PropertBenchmark.vue

@@ -66,7 +66,7 @@
           </el-form-item>
 
           <el-form-item>
-            <el-button type="primary" @click="queryApDataMx"
+            <el-button type="primary" @click="querycheck"
               >对标分析</el-button
             >
           </el-form-item>
@@ -75,11 +75,10 @@
       <el-table
         :data="gridData"
         :row-style="{ height: '10px' }"
-        :cell-style="{ textAlign: 'center', padding: '1px' }"
+        :cell-style="{ textAlign: 'center'}"
         :header-cell-style="headStyle"
         @selection-change="handleSelectionChange"
         @sort-change="changeTableSort"
-        style="font-size: 10px"
         v-if="value2 == 'xn'"
       >
         <el-table-column label="损失率对标列表">
@@ -129,12 +128,12 @@
       <el-table
         :data="gridData"
         :row-style="{ height: '10px' }"
-        :cell-style="{ textAlign: 'center', padding: '1px' }"
+        :cell-style="{ textAlign: 'center'}"
         :header-cell-style="headStyle"
         @selection-change="handleSelectionChange"
         @sort-change="changeTableSort"
-        style="font-size: 10px"
         v-if="value2 == 'qf'"
+        style="margin-bottom:21px"
       >
         <el-table-column label="损失率对标列表">
           <el-table-column type="index" width="30"> </el-table-column>
@@ -183,12 +182,12 @@
       <el-table
         :data="gridData"
         :row-style="{ height: '10px' }"
-        :cell-style="{ textAlign: 'center', padding: '1px' }"
+        :cell-style="{ textAlign: 'center' }"
         :header-cell-style="headStyle"
         @selection-change="handleSelectionChange"
         @sort-change="changeTableSort"
-        style="font-size: 10px"
         v-if="value2 == 'gz'"
+        style="margin-bottom:21px"
       >
         <el-table-column label="损失率对标列表">
           <el-table-column type="index" width="30"> </el-table-column>
@@ -237,12 +236,12 @@
       <el-table
         :data="gridData"
         :row-style="{ height: '10px' }"
-        :cell-style="{ textAlign: 'center', padding: '1px' }"
+        :cell-style="{ textAlign: 'center' }"
         :header-cell-style="headStyle"
         @selection-change="handleSelectionChange"
         @sort-change="changeTableSort"
-        style="font-size: 10px"
         v-if="value2 == 'jx'"
+        style="margin-bottom:21px"
       >
         <el-table-column label="损失率对标列表">
           <el-table-column type="index" width="30"> </el-table-column>
@@ -291,12 +290,12 @@
       <el-table
         :data="gridData"
         :row-style="{ height: '10px' }"
-        :cell-style="{ textAlign: 'center', padding: '1px' }"
+        :cell-style="{ textAlign: 'center'}"
         :header-cell-style="headStyle"
         @selection-change="handleSelectionChange"
         @sort-change="changeTableSort"
-        style="font-size: 10px"
         v-if="value2 == 'sl'"
+        style="margin-bottom:21px"
       >
         <el-table-column label="损失率对标列表">
           <el-table-column type="index" width="30"> </el-table-column>
@@ -403,6 +402,8 @@
 </template>
 <script>
 import * as echarts from "echarts";
+import formateDate from "@/utils/date";
+import formateDate1 from "@/utils/date";
 import FiveLossRatesPieChart from "../../views/benchMarking/FiveLossRatesPieChart.vue";
 import FiveLossRatesHistogramChart from "../../views/benchMarking/FiveLossRatesHistogramChart.vue";
 export default {
@@ -413,13 +414,10 @@ export default {
         project: "",
         line: "",
       },
-      timedate: [
-        // {beginDate:'2021-01-01'},
-        // {endDate:'2021-01-04'}
-      ],
+      timedate: [],
       isAsc: "asc",
-      beginDate: "2021-01-01",
-      endDate: "2021-01-04",
+      beginDate: "",
+      endDate: "",
       gridData: "",
       multipleSelection: [],
       sortInOrder: [],
@@ -508,6 +506,17 @@ export default {
     queryApData() {
       this.FiveLossInformation();
     },
+    querycheck(){
+      if(this.multipleSelection.length == 2){
+        this.queryApDataMx();
+      }else{
+        this.$message({
+          message:"请选择两个项目！",
+          type:'error'
+        });
+        return
+      }
+    },
     handleEdit(a, b) {
       this.wpId = [];
       this.lineDataOption = [];
@@ -702,13 +711,14 @@ export default {
       this.FiveLossInformation();
     },
     FiveLossInformation() {
+      var newData = new Date();
+       this.timedate[0] = formateDate1(newData.getTime()/1000);
+       this.timedate[1] = formateDate1(newData.getTime()/1000);
       let that = this;
       this.$http.get("/powercompare/windfarmAjax").then((res) => {
         that.options = res.data.data;
       });
       if (this.timedate == "") {
-        this.timedate[0] = "2021-01-01";
-        this.timedate[1] = "2021-01-04";
         this.beginDate = this.timedate[0];
         this.endDate = this.timedate[1];
       } else {
@@ -1017,7 +1027,12 @@ export default {
   text-align: center;
   float: left;
 }
-
+/deep/::-webkit-scrollbar {
+  z-index: 99999999;
+  width: 6px;
+  height: 13px !important;
+  background-color: #f5f5f5;
+}
 .dialogRightData {
   width: 50%;
   height: 650px;

src/views/PropertyBenchnark/PropertBenchmark_particulars.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div class="searchBar">
-      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin-left:1%">
         <el-row :gutter="1">
           <!-- <el-form-item label="风场一">
               <el-select v-model="value"  multiple placeholder="请选择">
@@ -30,7 +30,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="项目一">
+          <el-form-item label="风机一">
             <el-select v-model="pj" multiple clearable placeholder="请选择">
               <el-option
                 v-for="item in projectlist"
@@ -70,7 +70,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="项目二">
+          <el-form-item label="风机二">
             <el-select v-model="pj2" multiple clearable placeholder="请选择">
               <el-option
                 v-for="item in projectlist2"
@@ -99,7 +99,7 @@
             >
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="queryApDataMx"
+            <el-button type="primary" @click="querycheck"
               >对标分析</el-button
             >
           </el-form-item>
@@ -110,31 +110,33 @@
       </el-form>
       <el-card>
         <el-table
+          v-loading="loading"
           :data="fdcLineData"
           :row-style="{ height: '10px' }"
-          :cell-style="{ textAlign: 'center', padding: '1px' }"
+          :cell-style="{ textAlign: 'center'}"
           :header-cell-style="headStyle"
           @selection-change="handleSelectionChange"
           @sort-change="changeTableSort"
-          style="font-size: 10px; margin-bottom: 100px; widht: 100%"
+          style="widht: 100%"
+          max-height="399px"
         >
           <el-table-column label="场际对标列表一">
             <el-table-column fixed type="index" width="45"> </el-table-column>
             <el-table-column type="selection" width="45"> </el-table-column>
-            <el-table-column prop="pjName" label="风机名称" width="110">
+            <el-table-column prop="wtName" label="风机名称" width="110">
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="ordernum"
               label="排名"
-              width="50"
+              width="80"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="scadafdlnum"
               label="发电量排名"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
@@ -142,21 +144,21 @@
               prop="scadafdl"
               :formatter="filter_fdl"
               label="发电量"
-              width="70"
+              width="120"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzssnum"
               label="故障排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzss"
               label="故障损失"
-              width="70"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.gzss | rounding }}</span>
@@ -166,14 +168,14 @@
               :sortable="'custom'"
               prop="whssnum"
               label="检修排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="whss"
               label="检修损失"
-              width="80"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.whss | rounding }}</span>
@@ -183,14 +185,14 @@
               :sortable="'custom'"
               prop="qfssnum"
               label="性能排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qfss"
               label="性能损失"
-              width="80"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.qfss | rounding }}</span>
@@ -200,14 +202,14 @@
               :sortable="'custom'"
               prop="xdssnum"
               label="限电排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xdss"
               label="限电损失"
-              width="70"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.xdss | rounding }}</span>
@@ -217,112 +219,112 @@
               :sortable="'custom'"
               prop="slssnum"
               label="受累排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slss"
               label="受累损失"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="fnlyl"
               label="风能利用率"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzsslnum"
               label="故障损失率排名"
-              width="90"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzssl"
               label="故障损失率"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="jxsslnum"
               label="检修损失率排名"
-              width="90"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="jxssl"
               label="检修损失率"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qflnum"
               label="弃风率排名"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qfl"
               label="弃风率"
-              width="60"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xnsslnum"
               label="性能损失率排名"
-              width="85"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xnssl"
               label="性能损失率"
-              width="81"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slsslnum"
               label="受累损失率排名"
-              width="81"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slssl"
               label="受累损失率"
-              width="81"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="fwjsl"
               label="复位及时率"
-              width="81"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xqjsl"
               label="消缺及时率"
-              width="81"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="ztzhjsl"
               label="状态转换率"
-              width="81"
+              width="130"
             >
             </el-table-column>
           </el-table-column>
@@ -331,32 +333,34 @@
 
       <el-card>
         <el-table
+          v-loading="loading2"
           :data="fdcLineData2"
           :row-style="{ height: '10px' }"
-          :cell-style="{ textAlign: 'center', padding: '1px' }"
+          :cell-style="{ textAlign: 'center'}"
           :header-cell-style="headStyle"
           @selection-change="handleSelectionChange2"
           @sort-change="changeTableSort"
-          style="font-size: 10px; margin-bottom: 100px; widht: 100%"
+          style="widht: 100%"
+          max-height="399px"
           v-if="tb2"
         >
           <el-table-column label="场际对标列表二">
             <el-table-column fixed type="index" width="45"> </el-table-column>
             <el-table-column type="selection" width="45"> </el-table-column>
-            <el-table-column prop="pjName" label="风机名称" width="110">
+            <el-table-column prop="wtName" label="风机名称" width="110">
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="ordernum"
               label="排名"
-              width="50"
+              width="80"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="scadafdlnum"
               label="发电量排名"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
@@ -364,21 +368,21 @@
               prop="scadafdl"
               :formatter="filter_fdl"
               label="发电量"
-              width="70"
+              width="120"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzssnum"
               label="故障排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzss"
               label="故障损失"
-              width="70"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.gzss | rounding }}</span>
@@ -388,14 +392,14 @@
               :sortable="'custom'"
               prop="whssnum"
               label="检修排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="whss"
               label="检修损失"
-              width="80"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.whss | rounding }}</span>
@@ -405,14 +409,14 @@
               :sortable="'custom'"
               prop="qfssnum"
               label="性能排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qfss"
               label="性能损失"
-              width="80"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.qfss | rounding }}</span>
@@ -422,14 +426,14 @@
               :sortable="'custom'"
               prop="xdssnum"
               label="限电排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xdss"
               label="限电损失"
-              width="70"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.xdss | rounding }}</span>
@@ -439,112 +443,112 @@
               :sortable="'custom'"
               prop="slssnum"
               label="受累排名"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slss"
               label="受累损失"
-              width="70"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="fnlyl"
               label="风能利用率"
-              width="70"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzsslnum"
               label="故障损失率排名"
-              width="90"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="gzssl"
               label="故障损失率"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="jxsslnum"
               label="检修损失率排名"
-              width="90"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="jxssl"
               label="检修损失率"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qflnum"
               label="弃风率排名"
-              width="80"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="qfl"
               label="弃风率"
-              width="60"
+              width="110"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xnsslnum"
               label="性能损失率排名"
-              width="85"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xnssl"
               label="性能损失率"
-              width="81"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slsslnum"
               label="受累损失率排名"
-              width="81"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="slssl"
               label="受累损失率"
-              width="81"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="fwjsl"
               label="复位及时率"
-              width="81"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="xqjsl"
               label="消缺及时率"
-              width="81"
+              width="130"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="ztzhjsl"
               label="状态转换率"
-              width="81"
+              width="130"
             >
             </el-table-column>
           </el-table-column>
@@ -588,55 +592,10 @@ export default {
   data() {
     return {
       tb2: false,
-      formInline: {
-        windfarm: "",
-        project: "",
-        line: "",
-      },
-      tableData: [
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1517 弄",
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1519 弄",
-        },
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1516 弄",
-        },
-      ],
-      options: [
-        {
-          value: "MHS_FDC",
-          label: "麻黄山风电场",
-        },
-        {
-          value: "NSS_FDC",
-          label: "牛首山风电场",
-        },
-        {
-          value: "SBQ_FDC",
-          label: "石板泉风电场",
-        },
-        {
-          value: "QS_FDC",
-          label: "青山风电场",
-        },
-        {
-          value: "XS_FDC",
-          label: "香山风电场",
-        },
-      ],
+      loading:true,
+      loading2:true,
+      tableData: [],
+      options: [],
       fc: "",
       fc2: "",
       pj: "",
@@ -685,6 +644,10 @@ export default {
     },
   },
   created() {
+    this.timedate[0] = this.$route.query.beginDate;
+    this.timedate[1] = this.$route.query.endDate;
+    this.fc = this.$route.query.wpId;
+    this.query_xml();
     this.query_wpid();
     this.YardTableData();
   },
@@ -706,12 +669,24 @@ export default {
         guilty.append("orderByColumn", this.orderByColumn);
         guilty.append("isAsc", this.isAsc);
         guilty.append("wpId", this.fc2);
-        guilty.append("pjId", this.pj2);
+        guilty.append("wtId", this.pj2);
         guilty.append("beginDate", this.beginDate);
         guilty.append("endDate", this.endDate);
-        this.$http.post("/contrast/benchmarkPjList", guilty).then((res) => {
+        this.$http.post("/contrast/benchmarkWtList", guilty).then((res) => {
           this.fdcLineData2 = res.data.data;
+          this.loading2 = false;
+        });
+      }
+    },
+    querycheck(){
+      if(this.multipleSelection1.length + this.multipleSelection2.length ==2){
+        this.queryApDataMx();
+      }else{
+        this.$message({
+          message:"请选择两个项目！",
+          type:'error'
         });
+        return
       }
     },
     queryApDataMx() {
@@ -728,14 +703,14 @@ export default {
         return;
       }
       if (this.multipleSelection.length == 2) {
-        this.pjName1 = this.multipleSelection[0].pjName;
-        this.pjName2 = this.multipleSelection[1].pjName;
+        this.pjName1 = this.multipleSelection[0].wtName;
+        this.pjName2 = this.multipleSelection[1].wtName;
         this.fdcND1 =
-          this.multipleSelection[0].pjName +
+          this.multipleSelection[0].wtName +
           "" +
           formateDate(new Date(this.multipleSelection[0].recordDate) / 1000);
         this.fdcND2 =
-          this.multipleSelection[1].pjName +
+          this.multipleSelection[1].wtName +
           "" +
           formateDate(new Date(this.multipleSelection[1].recordDate) / 1000);
         this.fdcND.push(this.fdcND1, this.fdcND2);
@@ -763,7 +738,7 @@ export default {
         );
         for (let i = 0; i < this.multipleSelection.length; i++) {
           this.sortInOrde2.push({
-            product: this.multipleSelection[i].pjName,
+            product: this.multipleSelection[i].wtName+" "+formateDate(this.multipleSelection[i].recordDate/1000),
             "限电损失电量单位:万KWh": this.multipleSelection[i].xdss,
             "故障损失电量单位:万KWh": this.multipleSelection[i].gzss,
             "检修损失电量单位:万KWh": this.multipleSelection[i].jxssl,
@@ -875,14 +850,15 @@ export default {
         guilty.append("wpId", this.fc);
       }
       if (this.pj == "") {
-        guilty.append("wpId", this.pjId);
+        guilty.append("wtId", this.pjId);
       } else {
-        guilty.append("wpId", this.pj);
+        guilty.append("wtId", this.pj);
       }
       guilty.append("beginDate", this.beginDate);
       guilty.append("endDate", this.endDate);
-      this.$http.post("/contrast/benchmarkPjList", guilty).then((res) => {
+      this.$http.post("/contrast/benchmarkWtList", guilty).then((res) => {
         this.fdcLineData = res.data.data;
+        this.loading = false;
       });
     },
     query_xml() {
@@ -891,7 +867,7 @@ export default {
       this.pj2 = "";
       this.xl2 = "";
       this.$http
-        .get("powercompare/projectAjax?wpIds=" + this.fc)
+        .get("powercompare/windturbineAjax?wpId=" + this.fc)
         .then((res) => {
           this.projectlist = res.data.data;
         });
@@ -900,7 +876,7 @@ export default {
       this.pj = "";
       this.xl = "";
       this.$http
-        .get("powercompare/projectAjax?wpIds=" + this.fc2)
+        .get("powercompare/windturbineAjax?wpId=" + this.fc2)
         .then((res) => {
           this.projectlist2 = res.data.data;
         });
@@ -911,7 +887,7 @@ export default {
       });
     },
     headStyle() {
-      return "text-align:center";
+      return "text-align:left";
     },
     handleSelectionChange(val) {
       this.sortInOrder = [];
@@ -1123,7 +1099,12 @@ export default {
   text-align: center;
   float: left;
 }
-
+/deep/::-webkit-scrollbar {
+  z-index: 99999999;
+  width: 6px;
+  height: 13px !important;
+  background-color: #f5f5f5;
+}
 .dialogRightData {
   width: 50%;
   height: 650px;

src/views/SinglePerformanceAnalysis/PowerChart.vue

@@ -44,7 +44,7 @@
               <el-date-picker
                 v-model="month"
                 type="month"
-                value-format="dd"
+                value-format="M"
                 placeholder="选择月"
               >
               </el-date-picker>
@@ -58,9 +58,10 @@
 
           <div
             id="scatter_diagram_1"
+            v-loading="loading"
             style="
               height: 630px;
-              width: 1880px;
+              width: 1873px;
               margin-left: 3px;
               margin-bottom: 3px;
             "
@@ -119,7 +120,7 @@
               <el-date-picker
                 v-model="month"
                 type="month"
-                value-format="dd"
+                value-format="M"
                 placeholder="选择月"
               >
               </el-date-picker>
@@ -133,9 +134,10 @@
 
           <div
             id="scatter_diagram_2"
+            v-loading="loading2"
             style="
               height: 630px;
-              width: 1878px;
+              width: 1873px;
               margin-left: 3px;
               margin-bottom: 3px;
             "
@@ -194,7 +196,7 @@
               <el-date-picker
                 v-model="month"
                 type="month"
-                value-format="dd"
+                value-format="M"
                 placeholder="选择月"
               >
               </el-date-picker>
@@ -208,10 +210,10 @@
           <el-card>
             <div
               id="scatter_diagram_3"
+              v-loading="loading3"
               style="
                 height: 630px;
-                width: 1880px;
-                margin-left: 3px;
+                width: 1833px;
                 margin-bottom: 3px;
               "
             ></div>
@@ -245,6 +247,9 @@ export default {
       year: "2021",
       month: "01",
       activeName: "no_1",
+      loading:true,
+      loading2:true,
+      loading3:true,
       xllist: [],
       scatter_1: [],
       scatter_2: [],
@@ -254,6 +259,11 @@ export default {
   created() {},
   methods: {
     query_wpid() {
+      let that = this;
+      let newData = new Date();
+      this.year = newData.getFullYear()+'';
+      let month = newData.getMonth()+1; 
+      if(month<10){that.month='0'+month};
       this.$http.get("powercompare/windfarmAjax?").then((res) => {
         this.wpIdslist = res.data.data;
         // this.query_xml();
@@ -288,7 +298,9 @@ export default {
       digital.append("month", this.month);
       this.$http.post("/scatter/scatterAjax", digital).then((res) => {
         this.scatter_1 = res.data.data;
+        this.loading1=false;
         this.draw_scatter_diagram_1();
+        
       });
     },
     query_scatter_2() {
@@ -302,7 +314,9 @@ export default {
       digital.append("month", this.month);
       this.$http.post("/scatter/scatterAjax", digital).then((res) => {
         this.scatter_2 = res.data.data;
+        this.loading2=false;
         this.draw_scatter_diagram_2();
+        
       });
     },
     query_scatter_3() {
@@ -315,6 +329,7 @@ export default {
       digital.append("month", this.month);
       this.$http.post("/scatter/scatterAjax", digital).then((res) => {
         this.scatter_3 = res.data.data;
+        this.loading3=false;
         this.draw_scatter_diagram_3();
       });
     },
@@ -351,7 +366,6 @@ export default {
       var myChart = echarts.init(chartDom);
       var option;
 
-      //echarts.registerTransform(ecStat.transform.regression);
 
       option = {
         title: {
@@ -437,8 +451,6 @@ export default {
       var myChart = echarts.init(chartDom);
       var option;
 
-      echarts.registerTransform(ecStat.transform.regression);
-
       option = {
         title: {
           text: "项目功率排布情况",
@@ -521,7 +533,6 @@ export default {
       var myChart = echarts.init(chartDom);
       var option;
 
-      echarts.registerTransform(ecStat.transform.regression);
 
       option = {
         title: {

src/views/SinglePerformanceAnalysis/PowerandWindspeedChart.vue

@@ -60,6 +60,7 @@
         </el-form-item>
       </el-form>
       <div
+        v-loading="loading"
         id="scatter_diagram"
         style="
           height: 730px;
@@ -81,14 +82,16 @@ export default {
         name: "",
         id: "",
       },
+      loading:true,
+      loading2:true,
       wtIdslist: {
-        name: "",
-        id: "",
+        name: "麻黄山1号风机",
+        id: "MG01_01",
       },
       fc: "MHS_FDC",
-      fj: "",
-      year: "",
-      month: "",
+      fj: "MG01_01",
+      year: "2021",
+      month: "01",
       sdtDate: [],
       lineDate:[],
     };
@@ -105,6 +108,11 @@ export default {
         });
     },
     query_wpid() {
+      let that = this;
+      let newData = new Date();
+      this.year = newData.getFullYear()+'';
+      this.month = newData.getMonth()+1; 
+      if(this.month<10){that.month='0'+this.month};
       this.$http.get("powercompare/windfarmAjax?").then((res) => {
         this.wpIdslist = res.data.data;
       });
@@ -121,6 +129,7 @@ export default {
         this.sdtDate = res.data.data.scatter;
         this.lineDate = res.data.data.line;
         this.draw_scatter_diagram();
+        this.loading=false;
       });
     },
     draw_scatter_diagram() {
@@ -210,6 +219,7 @@ export default {
   },
   mounted() {
     this.query_wpid();
+    this.query_scatter();
   },
 };
 </script>

src/views/SinglePerformanceAnalysis/individualHistoryinformation.vue

@@ -143,6 +143,9 @@ export default {
       this.data_01 = formateDate(
         new Date(this.$route.query.data.recorddate) / 1000
       );
+      this.data_02 = formateDate(
+        new Date(this.$route.query.data.recorddate+60*60*24*1000) / 1000
+      );
       this.query_wpid();
     },
     goback() {

src/views/SinglePerformanceAnalysis/individualPandectinformation.vue

@@ -16,6 +16,7 @@
 
         <el-form-item label="日期">
               <el-date-picker
+                @change="query_table"
                 v-model="date_1"
                 value-format="yyyy-MM-dd"
                 type="date"
@@ -33,26 +34,28 @@
       ref="singleTable"
       :data="tableData"
        border
+       :cell-style="{ textAlign: 'center'}" 
       highlight-current-row
       style="width: 100%"
+      max-height="759px"
     >
       <el-table-column label="单机信息总览列表">
-      <el-table-column type="index" width="50"> </el-table-column>
+      <el-table-column type="index" width="80"> </el-table-column>
       <el-table-column property="windtpowerstationid" label="风场" width="120">
       </el-table-column>
       <el-table-column property="windturbineid" label="风机" width="120">
       </el-table-column>
-      <el-table-column property="modelid" label="型号" width="120">
+      <el-table-column property="modelid" label="型号" width="150">
       </el-table-column>
       <el-table-column property="daytop" label="日排行榜" width="120">
       </el-table-column>
-      <el-table-column property="daygoodness" label="日拟合优度" width="120">
+      <el-table-column property="daygoodness" label="日拟合优度" width="130">
       </el-table-column>
       <el-table-column property="dayspeed" label="日风速" width="120">
       </el-table-column>
       <el-table-column property="monthtop" label="月排行榜" width="120">
       </el-table-column>
-      <el-table-column property="monthgoodness" label="月拟合优度" width="120">
+      <el-table-column property="monthgoodness" label="月拟合优度" width="130">
       </el-table-column>
       <el-table-column property="monthspeed" label="月风速" width="120">
       </el-table-column>
@@ -79,11 +82,13 @@
 </template>
 <script>
 import * as echarts from "echarts";
+import formateDate from "@/utils/date";
+import formateDate1 from "@/utils/date_1";
 export default {
   data() {
     return {
       tableData: [],
-      date_1: "2021-01-01",
+      date_1: "",
       currentPage2: 1,
       pagesize: 10,
       isAsc:'asc',
@@ -92,7 +97,7 @@ export default {
         name: "",
         id: "",
       },
-      fc: "",
+      fc: "MHS_FDC",
     };
   },
   created() {},
@@ -101,9 +106,6 @@ export default {
       let that = this;
       this.tableData = [];
       var digital = new URLSearchParams();
-        digital.append('pageNum',this.currentPage2);
-        digital.append('pageSize',this.pagesize);
-        digital.append('orderByColumn',this.orderByColumn);
         digital.append('isAsc',this.isAsc);
         digital.append('wpId',this.fc);
         digital.append('recorddate',this.date_1);
@@ -131,13 +133,15 @@ export default {
       excelHelper.exportExcel("datatable", "xl数据", ".xls", true);
     },
     query_wpid() {
-      this.$http.get("powercompare/windfarmAjax?").then((res) => {
+        this.$http.get("powercompare/windfarmAjax?").then((res) => {
         this.wpIdslist = res.data.data;
       });
     },
     
   },
   mounted() {
+    var newData = new Date();
+    this.date_1 =  formateDate1(newData.getTime()/1000);
     this.query_wpid();
     this.query_table();
   },