Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/SIS_Web

src/views/BorderBenchmark/InternationalBenchmark.vue

@@ -48,7 +48,7 @@
         @selection-change="handleSelectionChange"
         @sort-change="changeTableSort"
       >
-        <el-table-column label="场外对标列表">
+        
           <el-table-column type="index" width="50"> </el-table-column>
           <el-table-column
             type="selection"
@@ -221,13 +221,13 @@
           <el-table-column fixed="right" prop="address" label="操作" width="70">
             <template slot-scope="scope">
               <el-button
-                size="mini"
+                size="medium"
+                type="text"
                 @click="handleEdit(scope.$index, scope.row)"
                 >详情</el-button
               >
             </template>
           </el-table-column>
-        </el-table-column>
       </el-table>
 
       <el-dialog
@@ -272,13 +272,13 @@
         <el-col :span="12"
           ><div
             id="chartPie"
-            style="width: 800px; height: 400px; margin: auto"
+            style="width: 800px; height: 400px; margin-top: 33px;margin-left:99px"
           ></div>
         </el-col>
         <el-col :span="12">
           <div
             id="chartPieRight"
-            style="width: 800px; height: 400px; margin: auto"
+            style="width: 800px; height: 400px;  margin-top: 33px;margin-left:99px"
           ></div
         ></el-col>
       </el-row>

src/views/BorderBenchmark/YardBenchmark.vue

@@ -90,12 +90,13 @@
           style="width: 100%"
           :cell-style="{ textAlign: 'center' }"
           :header-cell-style="headStyle"
+          border
           max-height="370px"
           height="370px"
           @selection-change="changeFun"
         >
           >
-          <el-table-column label="场内对标列表">
+          <!-- <el-table-column label="场内对标列表"> -->
             <el-table-column type="index" width="50"> </el-table-column>
             <el-table-column
               type="selection"
@@ -307,21 +308,22 @@
             >
             </el-table-column>
             <el-table-column
-              fixed="left"
-              prop="address"
+              fixed="right"
               label="操作"
               width="100"
             >
               <template slot-scope="scope">
                 <el-button
-                  size="mini"
+                  size="medium"
+                  type="text"
                   @click="handleEdit(scope.$index, scope.row)"
                   >详情</el-button
                 >
-              </template>
-            </el-table-column>
-          </el-table-column>
+               </template>
+              </el-table-column>            
+          <!-- </el-table-column> -->
         </el-table>
+  
       </el-card>
 
       <el-row

src/views/NormRanking/GoodnessfitRank.vue

@@ -201,7 +201,7 @@ export default {
       for (let i = 0; i < Object.keys(val).length; i++) {
         wt.push(val[i].windturbine);
       }
-      this.$http
+          this.$http
         .get(
           "leaderboard/fittingtopchart?wtIds=" +
             wt +
@@ -228,6 +228,7 @@ export default {
             });
           }
         });
+      
     },
     toExcel() {
       let that = this;
@@ -305,7 +306,10 @@ export default {
   },
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
+/deep/.el-table__header-wrapper  .el-checkbox{
+	display:none
+}
 </style>
   
     

src/views/Performance/PerformanceList.vue

@@ -330,7 +330,7 @@
                     <el-table-column
                       sortable
                       :formatter="filter_daynhxdssdl"
-                      prop="daynhxdssdl"
+                      prop="daynhqfdl"
                       label="性能"
                       width="63"
                     >
@@ -532,6 +532,7 @@ export default {
         lyl:[],
         wtName:[],
         total:[],
+        daynhwhssdl:[]
       }
     };
   },
@@ -621,6 +622,7 @@ export default {
           this.linechar_data.daynhxdssdl=[];
           this.linechar_data.lyl=[];
           this.linechar_data.wtName=[];
+          this.linechar_data.daynhwhssdl=[];
           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++){
@@ -634,6 +636,7 @@ export default {
             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));
+             that.linechar_data.daynhwhssdl.push(queryAll_table[i].daynhwhssdl.toFixed(2));
             }
           }
           if (this.tableid === "fc") {
@@ -745,6 +748,7 @@ export default {
           this.linechar_data.daynhxdssdl=[];
           this.linechar_data.lyl=[];
           this.linechar_data.wtName=[];
+          this.linechar_data.daynhwhssdl=[];
           let queryAll_table = res.data.data.list;
           let queryAll_table_lyl = res.data.data.lyl;
           //this.query_lyl(queryAll_table);
@@ -759,6 +763,7 @@ export default {
             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));
+            that.linechar_data.daynhwhssdl.push(queryAll_table[i].daynhwhssdl.toFixed(2));
             }
             
           }
@@ -821,7 +826,7 @@ export default {
       return parseFloat(cellValue.daynhcfdl).toFixed(2);
     },
     filter_daynhxdssdl(cellValue) {
-      return parseFloat(cellValue.daynhxdssdl).toFixed(2);
+      return parseFloat(cellValue.daynhqfdl).toFixed(2);
     },
     filter_lyl(cellValue) {
       return parseFloat(cellValue.lyl).toFixed(2);
@@ -890,6 +895,7 @@ export default {
         },
         xAxis: {
           type: "value",
+          max: Math.ceil(Math.max.apply(null, date.total))+ Math.ceil((Math.max.apply(null, date.total))*0.08)
         },
         yAxis: {
           type: "category",
@@ -966,7 +972,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.daynhxdssdl,
+            data: date.daynhqfdl,
           },
           //曲线
           {
@@ -1011,7 +1017,7 @@ export default {
           "#058DC7",
         ],
         title: {
-          text: "风机绩效榜单",
+          text: "项目绩效榜单",
           left: 300,
           top: -5,
           textStyle: {
@@ -1046,7 +1052,8 @@ export default {
         },
         xAxis: {
           type: "value",
-        },
+          max: Math.ceil(Math.max.apply(null, date.total))+ Math.ceil((Math.max.apply(null, date.total))*0.08)
+         },
         yAxis: {
           type: "category",
           data: date.wtName,
@@ -1122,7 +1129,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.daynhxdssdl,
+            data: date.daynhqfdl,
           },
           //曲线
           {
@@ -1166,7 +1173,7 @@ export default {
           "#058DC7",
         ],
         title: {
-          text: "风机绩效榜单",
+          text: "路线绩效榜单",
           left: 300,
           top: -5,
           textStyle: {
@@ -1201,6 +1208,7 @@ export default {
         },
         xAxis: {
           type: "value",
+          max: Math.ceil(Math.max.apply(null, date.total))+ Math.ceil((Math.max.apply(null, date.total))*0.08)
         },
         yAxis: {
           type: "category",
@@ -1277,7 +1285,7 @@ export default {
             emphasis: {
               focus: "series",
             },
-            data: date.daynhxdssdl,
+            data: date.daynhqfdl,
           },
           //曲线
           {

src/views/ProjectBenchmark/ProjectBenchmark.vue

@@ -63,7 +63,6 @@
         max-height="388px"
         style="margin-bottom:30px"
       >
-        <el-table-column label="项目对标列表">
           <el-table-column type="index" width="50"> </el-table-column>
           <el-table-column
             type="selection"
@@ -237,13 +236,13 @@
           <el-table-column fixed="right" prop="address" label="操作" width="70">
             <template slot-scope="scope">
               <el-button
-                size="mini"
+                size="medium"
+                type="text"
                 @click="handleEdit(scope.$index, scope.row)"
                 >详情</el-button
               >
             </template>
           </el-table-column>
-        </el-table-column>
       </el-table>
 
       <el-dialog
@@ -288,13 +287,13 @@
         <el-col :span="12"
           ><div
             id="chartPie"
-            style="width: 800px; height: 400px; margin-left: 99px"
+            style="width: 800px; height: 400px; margin-left: 99px ;margin-top:-13px"
           ></div>
         </el-col>
         <el-col :span="12">
           <div
             id="chartPieRight"
-            style="width: 800px; height: 400px; margin-left: 99px"
+            style="width: 800px; height: 400px; margin-left: 99px ;margin-top:-13px"
           ></div
         ></el-col>
       </el-row>

src/views/ProjectBenchmark/ProjectBenchmark_particulars.vue

@@ -615,8 +615,8 @@ export default {
       multipleSelection2: [],
       orderByColumn: "",
       isAsc: "asc",
-      fdcLineData: "",
-      fdcLineData2: "",
+      fdcLineData: [],
+      fdcLineData2: [],
       currentPage2: 1,
       pagesize: 10,
       wpId: "",

src/views/PropertyBenchnark/PropertBenchmark.vue

@@ -404,7 +404,6 @@
 import * as echarts from "echarts";
 import formateDate from "@/utils/date";
 import formateDate1 from "@/utils/date_1";
-import FiveLossRatesPieChart from "../../views/benchMarking/FiveLossRatesPieChart.vue";
 import FiveLossRatesHistogramChart from "../../views/benchMarking/FiveLossRatesHistogramChart.vue";
 export default {
   data() {
@@ -496,7 +495,6 @@ export default {
       return "text-align:center";
     },
     onSubmit() {
-      console.log("submit!");
     },
     handleClick() {},
     deleteRow(index, rows) {
@@ -528,7 +526,6 @@ export default {
             name: this.multipleSelection[i].wpName,
           });
         }
-        console.log(this.lineDataOption);
         this.$router.push({
           path: "/benchmark_property_particulars",
           query: {
@@ -540,9 +537,7 @@ export default {
           },
         });
       } else {
-        console.log(b);
         this.lineDataOption.push({ id: b.wpId, name: b.wpName });
-        console.log(this.lineDataOption);
         this.$router.push({
           path: "/benchmark_property_particulars",
           query: {
@@ -694,10 +689,8 @@ export default {
       }
     },
     handleCurrentChange(val) {
-      // console.log(`当前页: ${val}`);
     },
     handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
       this.pagesize = val;
     },
     changeTableSort(column) {
@@ -879,7 +872,6 @@ export default {
       charts2.setOption(option2);
     },
     getPackageData(gridData, value2) {
-      console.log(value2);
       for (let i = 0; i < gridData.length; i++) {
         this.getChartDataValue.push({
           value: gridData[i].fdl,

src/views/PropertyBenchnark/PropertBenchmark_particulars.vue

@@ -596,8 +596,8 @@ export default {
       multipleSelection2: [],
       orderByColumn: "",
       isAsc: "asc",
-      fdcLineData: "",
-      fdcLineData2: "",
+      fdcLineData: [],
+      fdcLineData2: [],
       currentPage2: 1,
       pagesize: 10,
       wpId: "",

src/views/SinglePerformanceAnalysis/PowerandWindspeedChart.vue

@@ -64,7 +64,7 @@
         id="scatter_diagram"
         style="
           height: 730px;
-          width: 1993px;
+          width: 95%;
           margin-left: 9px;
           margin-bottom: 39px;
         "

src/views/SinglePerformanceAnalysis/individualPandectinformationdetails.vue

@@ -1473,7 +1473,7 @@ export default {
             name: "应发功率",
             type: "line",
             smooth: true,
-            data: this.zoom.yfgl,
+            data: this.zoom.bzgl,
             markArea: {
               data: this.datezoom_table,
             },