6-1 等级评估 切入切出 布局优化 功能优化

src/assets/css/base.scss

@@ -371,4 +371,19 @@ body,
   }
 }
 
+#table_sty{
+  
+  th{
+    padding: 0 !important;
+    height: 30px;
+    line-height: 30px;
+  }
+  td{
+    padding: 0 !important;
+    font-size: 13px !important;
+    height: 30px;
+    line-height: 30px;
+  }
+}
+
 /***ElUI - 公共调整 - 结束***/

src/assets/css/performanceAnalysis/cutAndSpeed.scss

@@ -1,7 +1,7 @@
 .box {
     width: 100%;
     // display: flex;
-    justify-content: space-around;
+    justify-content: flex-start;
     align-items: center;
     overflow: hidden;
 }

src/assets/css/performanceAnalysis/cutAndSpeedHistory.scss

@@ -1,7 +1,7 @@
 .box{
     width: 100%;
     // display: flex;
-    justify-content: space-around;
+    justify-content: flex-start;
      align-items: center;
      overflow: hidden;
 }

src/assets/css/performanceAnalysis/gradeEvaluation.scss

@@ -1,7 +1,7 @@
 .box {
     width: 100%;
     display: flex;
-    justify-content: space-around;
+    justify-content: flex-start;
     align-items: center;
     overflow: hidden;
   }

src/assets/css/performanceAnalysis/plannedGeneration.scss

@@ -1,7 +1,7 @@
 .box{
     width: 100%;
     // display: flex;
-    justify-content: space-around;
+    justify-content: flex-start;
      align-items: center;
      overflow: hidden;
 }

src/assets/css/performanceAnalysis/rankingLoadRate.scss

@@ -1,7 +1,7 @@
 .box{
     width: 100%;
     // display: flex;
-    justify-content: space-around;
+    justify-content:  flex-start;
      align-items: center;
      overflow: hidden;
 }

src/assets/js/benchmarkingSys/performanceList.js

@@ -1,6 +1,6 @@
-
 import * as echarts from "echarts";
 import excelHelper from "@utils/excelHelper";
+
 export default {
   data() {
     return {

src/assets/js/performanceAnalysis/cutAndSpeedHistory.js

@@ -32,6 +32,9 @@ export default {
         this.callAndSpeedData();
     },
     methods:{
+        dateformat(row, column, cellValue, index){
+            return this.Moment(column.recorddate).format("yyyy-MM-DD")
+        },
         queryApData() {
             this.callAndSpeedData();
         },

src/assets/js/performanceAnalysis/gradeEvaluation.js

@@ -1,4 +1,3 @@
-// import excelHelper from "@/utils/excelHelper";
 import * as echarts from "echarts";
 export default {
   data() {
@@ -28,7 +27,7 @@ export default {
       //分页起始页
       currentPage2: 1,
       //每页显示数据个数
-      pagesize: 10,
+      pagesize: 17,
       //等级评估对标雷达图1数据
       radarChartData1: [],
       //等级评估对标雷达图2数据
@@ -352,15 +351,15 @@ export default {
     },
     //导出excel风机等级评估日数据
     exportDayData() {
-      excelHelper.exportExcel("daytable", "等级评估日数据", ".xls", true);
+      this.BASE.excelHelp("daytable", "等级评估日数据", ".xls", true);
     },
     //导出excel风机等级评估月数据
     exportMonthData() {
-      excelHelper.exportExcel("monthtable", "等级评估月数据", ".xls", true);
+      this.BASE.excelHelp("monthtable", "等级评估月数据", ".xls", true);
     },
     //导出excel风机等级评估年数据
     exportYearData() {
-      excelHelper.exportExcel("yeartable", "等级评估年数据", ".xls", true);
+      this.BASE.excelHelp("yeartable", "等级评估年数据", ".xls", true);
     },
     //点击打开日对比框方法
     dialogTableVisibleOpen() {
@@ -437,6 +436,7 @@ export default {
       page.append("recorddate", this.value1);
       this.API.post("/benchmarking/gadaylistByPage", page).then((res) => {
         //gridData日表格数据
+        debugger
         that.gridData = res.data.list;
         //total日分页数据
         that.total = res.data.total;

src/assets/js/performanceAnalysis/plannedGeneration.js

@@ -94,6 +94,7 @@ export default {
         },
         tableDatawindturbineName(val){
           this.dialogFormVisible2 = true;
+          
           this.fanData = val;
           console.log(this.fanData)
           var modifyData = new URLSearchParams();

src/tools/base.js

@@ -1,4 +1,9 @@
 import crypto from "crypto";
+import excelHelper from "@utils/excelHelper";
+//导出excel
+export function excelHelp(tname,tdate,sic,bool){
+  excelHelper.exportExcel(tname, tdate, sic, bool);
+}
 
 //个位数字补零
 export function numberB0(n) {
@@ -198,6 +203,7 @@ export function tranListToTreeData(list , rootValue){
 }
 
 export default {
+  excelHelp,
   numberCeil,
   getBzDate,
   cascaderBugRepair,
@@ -206,4 +212,5 @@ export default {
   getBztime,
   numberB0,
   tranListToTreeData,
+
 };

src/tools/echartsToolLzx.js

@@ -109,7 +109,6 @@ export function getSingleMachineSaturationChart(id, gridDataChartX, data, legend
       nameTextStyle: {
         padding: [0, 0, 30, 0]    // 四个数字分别为上右下左与原位置距离
       },
-      max: 2000,
       axisLabel: {
         formatter: function (value) {
           var texts = [];

src/views/performanceAnalysis/cutAndSpeedHistory.vue

@@ -58,7 +58,7 @@
             </el-form>
             </el-card>
             <el-table
-            id="callthepolicetable"
+            class="table_sty"
             :data="gridData"
             :row-style="{ height: '10px' }" 
             :cell-style="{ textAlign: 'center',}" 
@@ -67,41 +67,35 @@
             style="width:100%;margin-top:1%">
             <el-table-column label="切入切出风速整合历史">
             <el-table-column
-              type="index"
-              width="40">
+              type="index">
             </el-table-column>
             <el-table-column
               prop="windturbineid"
-              label="风机"
-               width="150">
+              label="风机">
             </el-table-column>
             <el-table-column
+            :formatter="dateformat"
             prop="recorddate"
-              label="日期"
-               width="150">
+              label="日期">
             <!-- <template slot-scope="scope">
                 {{scope.row.recorddate  | formatDate}}
             </template> -->
             </el-table-column>
             <el-table-column
               prop="inputsmallratio"
-              label="总小风切入"
-              width="150">
+              label="总小风切入">
             </el-table-column>
             <el-table-column
               prop="inputbigratio"
-              label="总大风切入"
-               width="150">
+              label="总大风切入">
             </el-table-column>
             <el-table-column
               prop="outputsmallratio"
-              label="总小风切出"
-               width="150">
+              label="总小风切出">
             </el-table-column>
             <el-table-column
               prop="outputbigmaxratio"
-              label="总大风切出"
-               width="150">
+              label="总大风切出">
             </el-table-column>
             <el-table-column
               prop="dayinputsmall"
@@ -110,58 +104,47 @@
             </el-table-column>
             <el-table-column
               prop="dayoutputsmall"
-              label="日小风切出"
-               width="150">
+              label="日小风切出">
             </el-table-column>
             <el-table-column
               prop="dayinputbig"
-              label="日大风切入"
-               width="150">
+              label="日大风切入">
             </el-table-column>
             <el-table-column
               prop="dayoutputbig"
-              label="日大风切出"
-               width="150">
+              label="日大风切出">
             </el-table-column>
             <el-table-column
               prop="monthinputsmall"
-              label="月小风切入"
-               width="150">
+              label="月小风切入">
             </el-table-column>
             <el-table-column
               prop="monthinputbig"
-              label="月大风切入"
-               width="150">
+              label="月大风切入">
             </el-table-column>
             <el-table-column
               prop="monthoutputsmall"
-              label="月小风切出"
-               width="150">
+              label="月小风切出">
             </el-table-column>
             <el-table-column
               prop="monthoutputbig"
-              label="月大风切出"
-               width="150">
+              label="月大风切出">
             </el-table-column>
             <el-table-column
               prop="yearinputsmall"
-              label="年小风切入"
-               width="150">
+              label="年小风切入">
             </el-table-column>
             <el-table-column
               prop="yearinputbig"
-              label="年大风切入"
-               width="150">
+              label="年大风切入">
             </el-table-column>
             <el-table-column
               prop="yearoutputsmall"
-              label="年小风切出"
-               width="150">
+              label="年小风切出">
             </el-table-column>
             <el-table-column
               prop="yearoutputbig"
-              label="年大风切出"
-               width="150">
+              label="年大风切出">
             </el-table-column>
             </el-table-column>        
        </el-table>

src/views/performanceAnalysis/gradeEvaluation.vue

@@ -57,6 +57,7 @@
             <div class="margin">
               <div class="dialogLeftData">
                 <el-table
+                  class="table_sty"
                   :data="sortInOrderTop"
                   height="97"
                   border
@@ -83,6 +84,7 @@
 
               <div class="dialogRightData">
                 <el-table
+                class="table_sty"
                   :data="sortInOrder"
                   height="618"
                   :row-style="{ height: '10px' }"
@@ -204,6 +206,7 @@
 
               <div class="dialogRightData">
                 <el-table
+                class="table_sty"
                   :data="sortInOrder"
                   height="618"
                   :row-style="{ height: '10px' }"
@@ -293,6 +296,7 @@
             <div class="margin">
               <div class="dialogLeftData">
                 <el-table
+                class="table_sty"
                   :data="sortInOrderTop"
                   height="97"
                   border
@@ -319,6 +323,7 @@
 
               <div class="dialogRightData">
                 <el-table
+                class="table_sty"
                   :data="sortInOrder"
                   height="618"
                   :row-style="{ height: '10px' }"
@@ -362,6 +367,7 @@
 
       <el-main v-if="dailyInformation == true">
         <el-table
+        class="table_sty"
           id="daytable"
           :data="gridData"
           height="640"
@@ -377,151 +383,133 @@
               :sortable="'custom'"
               prop="windturbineid"
               label="风机"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="level"
               label="等级"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="rank"
               label="排名"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayfdl"
               label="发电量"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayllfdl"
               label="理论电量"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayfs"
               label="风速"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daygl"
               label="功率"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daygzssdl"
               label="故障损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayxdssdl"
               label="限电损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daywhssdl"
               label="维护损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayxnssdl"
               label="性能损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayslssdl"
               label="受累损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daylyxs"
               label="利用小时数"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daynhyd"
               label="拟合优度"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daysbklyl"
               label="设备可利用率"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daydxkyxs"
               label="等效可用系数"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayyxfss"
               label="有效风时数"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayxfqr"
               label="切入风速"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayjfpl"
               label="静风频率"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayglyzxxs"
               label="功率一致性系数"
-              width="150"
             >
             </el-table-column>
           </el-table-column>
         </el-table>
         <div style="text-align: center">
           <el-pagination
+            
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
             :current-page.sync="currentPage2"
-            :page-sizes="[10, 50, 100, 1000]"
+            :page-sizes="[18, 50, 100, 1000]"
             :page-size="pagesize"
+            small
             layout="total,sizes, prev, pager, next"
             :total="total"
           >
@@ -530,6 +518,7 @@
       </el-main>
       <el-main v-if="monthlyInformation == true">
         <el-table
+        class="table_sty"
           id="monthtable"
           :data="gridDataMonth"
           height="640"
@@ -545,140 +534,120 @@
               :sortable="'custom'"
               prop="windturbineid"
               label="风机"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="level"
               label="等级"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="rank"
               label="排名"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayfdl"
               label="发电量"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayllfdl"
               label="理论电量"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayfs"
               label="风速"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daygl"
               label="功率"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daygzssdl"
               label="故障损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayxdssdl"
               label="限电损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daywhssdl"
               label="维护损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayxnssdl"
               label="性能损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayslssdl"
               label="受累损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daylyxs"
               label="利用小时数"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daynhyd"
               label="拟合优度"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daysbklyl"
               label="设备可利用率"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daydxkyxs"
               label="等效可用系数"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayyxfss"
               label="有效风时数"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayxfqr"
               label="切入风速"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayjfpl"
               label="静风频率"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayglyzxxs"
               label="功率一致性系数"
-              width="150"
             >
             </el-table-column>
           </el-table-column>
@@ -688,7 +657,7 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
             :current-page.sync="currentPage2"
-            :page-sizes="[10, 50, 100, 1000]"
+            :page-sizes="[18, 50, 100, 1000]"
             :page-size="pagesize"
             layout="total,sizes, prev, pager, next"
             :total="totalMonth"
@@ -698,6 +667,7 @@
       </el-main>
       <el-main v-if="annualInformation == true">
         <el-table
+        class="table_sty"
           id="yeartable"
           :data="gridDataYear"
           height="640"
@@ -713,140 +683,120 @@
               :sortable="'custom'"
               prop="windturbineid"
               label="风机"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="level"
               label="等级"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="rank"
               label="排名"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayfdl"
               label="发电量"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayllfdl"
               label="理论电量"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayfs"
               label="风速"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daygl"
               label="功率"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daygzssdl"
               label="故障损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayxdssdl"
               label="限电损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daywhssdl"
               label="维护损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayxnssdl"
               label="性能损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayslssdl"
               label="受累损失"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daylyxs"
               label="利用小时数"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daynhyd"
               label="拟合优度"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daysbklyl"
               label="设备可利用率"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="daydxkyxs"
               label="等效可用系数"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayyxfss"
               label="有效风时数"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayxfqr"
               label="切入风速"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayjfpl"
               label="静风频率"
-              width="150"
             >
             </el-table-column>
             <el-table-column
               :sortable="'custom'"
               prop="dayglyzxxs"
               label="功率一致性系数"
-              width="150"
             >
             </el-table-column>
           </el-table-column>
@@ -856,7 +806,7 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
             :current-page.sync="currentPage2"
-            :page-sizes="[10, 50, 100, 1000]"
+            :page-sizes="[18, 50, 100, 1000]"
             :page-size="pagesize"
             layout="total,sizes, prev, pager, next"
             :total="totalYear"

src/views/performanceAnalysis/plannedGeneration.vue

@@ -53,6 +53,7 @@
             </el-form>
             </el-card>
             <el-table
+            class="table_sty"
             id="callthepolicetable"
             :data="gridData"
             :row-style="{ height: '10px' }" 
@@ -69,82 +70,67 @@
             <el-table-column
               prop="projectName"
               label="名称"
-               width="150"
             >
             </el-table-column>
             <el-table-column
               prop="year"
-              label="年"
-              width="150">
+              label="年">
             </el-table-column>
             <el-table-column
               prop="gc01"
-              label="1月"
-               width="150">
+              label="1月">
             </el-table-column>
             <el-table-column
               prop="gc02"
-              label="2月"
-               width="150">
+              label="2月">
             </el-table-column>
             <el-table-column
               prop="gc03"
-              label="3月"
-               width="150">
+              label="3月">
             </el-table-column>
             <el-table-column
               prop="gc04"
-              label="4月"
-               width="150">
+              label="4月">
             </el-table-column>
             <el-table-column
               prop="gc05"
-              label="5月"
-               width="150">
+              label="5月">
             </el-table-column>
             <el-table-column
               prop="gc06"
-              label="6月"
-               width="150">
+              label="6月">
             </el-table-column>
             <el-table-column
               prop="gc07"
-              label="7月"
-               width="150">
+              label="7月">
             </el-table-column>
             <el-table-column
               prop="gc08"
-              label="8月"
-               width="150">
+              label="8月">
             </el-table-column>
             <el-table-column
               prop="gc09"
-              label="9月"
-               width="150">
+              label="9月">
             </el-table-column>
             <el-table-column
               prop="gc10"
-              label="10月"
-               width="150">
+              label="10月">
             </el-table-column>
             <el-table-column
               prop="gc11"
-              label="11月"
-               width="150">
+              label="11月">
             </el-table-column>
             <el-table-column
               prop="gc12"
-              label="12月"
-               width="150">
+              label="12月">
             </el-table-column>
             <el-table-column
               prop="generatingcapacity"
-              label="合计"
-               width="150">
+              label="合计">
             </el-table-column>
             </el-table-column>        
        </el-table>
-       <el-dialog title="新增信息" :visible.sync="dialogFormVisible">
+       <el-dialog title="新增信息" :visible.sync="dialogFormVisible" :modal-append-to-body="false">
             <el-form :model="form">
                 <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin-left:3.5%">
                 <el-form-item label="风场：" >