2-18 风机榜单<图表

src/views/Performance/NewPerformanceList.vue

@@ -89,124 +89,139 @@
               <el-card
                 shadow="always"
                 ref="fc_zzt_card"
-                style="width: 45%; display: table-cell; vertical-align: middle"
+                style="width: 40%; display: table-cell; vertical-align: middle"
               >
                 <div
                   id="histogram_fc"
-                  style="width: 800px; height: 600px; margin: auto"
+                  style="width: 100%; height: 600px; margin: auto"
                 ></div>
               </el-card>
 
               <el-card
                 shadow="always"
-                style="width: 45%"
+                style="width: 58%"
                 height="600px"
                 id="moban"
               >
-                <el-table id="fc_table" :data="fc_date" style="width: 100%" max-height="800px">
+                <el-table id="fc_table" :data="fc_date" style="width: 100%;font-size:1px" max-height="800px">
                   <el-table-column label="项目列表">
-                    <el-table-column fixed type="index" width="45">
+                    <el-table-column fixed type="index" width="36">
                     </el-table-column>
-                    <el-table-column prop="generation" label="名称" width="150">
+                    <el-table-column prop="generation" label="名称" width="75">
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_llfdl"
                       prop="llfdl"
                       label="理论发电量"
-                      width="120"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_scadafdl"
                       prop="scadafdl"
-                      label="SCADA发电量"
-                      width="120"
+                      label="发电量"
+                      width="75"
                     >
                     </el-table-column>
-                    <el-table-column prop="speed" label="风速" width="120">
+                    <el-table-column :formatter="filter_speed" prop="speed" label="风速" width="55">
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_gzssdl"
                       prop="gzssdl"
-                      label="故障损失电量"
-                      width="300"
+                      label="故障损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_gzslssdl"
                       prop="gzslssdl"
-                      label="故障受累损失电量"
-                      width="120"
+                      label="故障受累损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                     :formatter="filter_jxssdl"
                       prop="jxssdl"
-                      label="检修损失电量"
-                      width="120"
+                      label="检修损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_jxslssdl"
                       prop="jxslssdl"
-                      label="检修受累损失电量"
-                      width="120"
+                      label="检修受累损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_dwslssdl"
                       prop="dwslssdl"
-                      label="电网受累损失电量"
-                      width="120"
+                      label="电网受累损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                     :formatter="filter_hjslssdl"
                       prop="hjslssdl"
-                      label="环境受累损失电量"
-                      width="120"
+                      label="环境受累损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_xdjclssdl"
                       prop="xdjclssdl"
-                      label="限电降出力损失电量"
-                      width="120"
+                      label="限电降出力损失"
+                      width="85"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_xdtjssdl"
                       prop="xdtjssdl"
-                      label="限电停机损失电量"
-                      width="120"
+                      label="限电停机损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_dfssdl"
                       prop="dfssdl"
-                      label="待风损失电量"
-                      width="120"
+                      label="待风损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_sdtjssdl"
                       prop="sdtjssdl"
-                      label="手动停机损失电量"
-                      width="120"
+                      label="手动停机损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_zcfdssdl"
                       prop="zcfdssdl"
-                      label="正常发电损失电量"
-                      width="120"
+                      label="正常发电损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_qxjclssdl"
                       prop="qxjclssdl"
-                      label="缺陷降出力损失电量"
-                      width="120"
+                      label="缺陷降出力"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_fnlyl"
                       prop="fnlyl"
                       label="风能利用率"
-                      width="120"
+                      width="75"
                     >
                     </el-table-column>
                   </el-table-column>
@@ -221,129 +236,144 @@
             >
               <el-card
                 shadow="always"
-                style="width: 45%; display: table-cell; vertical-align: middle"
+                style="width: 40%; display: table-cell; vertical-align: middle"
               >
                 <div
                   id="histogram_xm"
-                  style="width: 800px; height: 800px; margin: auto"
+                  style="width: 100%; height: 800px; margin: auto"
                 ></div>
               </el-card>
 
               <el-card
                 shadow="always"
-                style="width: 45%"
+                style="width: 58%"
                 height="400px"
                 id="moban"
               >
                 <el-table
                   id="pj_table"
                   :data="pj_date"
-                  style="width: 100%"
+                  style="width: 100%;font-size:1px;margin-bottom:10px"
                   max-height="800px"
                 >
                   <el-table-column label="项目列表">
-                    <el-table-column fixed type="index" width="45">
+                      <el-table-column fixed type="index" width="36">
                     </el-table-column>
-                    <el-table-column prop="generation" label="名称" width="150">
+                    <el-table-column prop="generation" label="名称" width="85">
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_llfdl"
                       prop="llfdl"
                       label="理论发电量"
-                      width="120"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_scadafdl"
                       prop="scadafdl"
-                      label="SCADA发电量"
-                      width="120"
+                      label="发电量"
+                      width="75"
                     >
                     </el-table-column>
-                    <el-table-column prop="speed" label="风速" width="120">
+                    <el-table-column :formatter="filter_speed" prop="speed" label="风速" width="55">
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_gzssdl"
                       prop="gzssdl"
-                      label="故障损失电量"
-                      width="300"
+                      label="故障损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_gzslssdl"
                       prop="gzslssdl"
-                      label="故障受累损失电量"
-                      width="120"
+                      label="故障受累损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                     :formatter="filter_jxssdl"
                       prop="jxssdl"
-                      label="检修损失电量"
-                      width="120"
+                      label="检修损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_jxslssdl"
                       prop="jxslssdl"
-                      label="检修受累损失电量"
-                      width="120"
+                      label="检修受累损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_dwslssdl"
                       prop="dwslssdl"
-                      label="电网受累损失电量"
-                      width="120"
+                      label="电网受累损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                     :formatter="filter_hjslssdl"
                       prop="hjslssdl"
-                      label="环境受累损失电量"
-                      width="120"
+                      label="环境受累损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_xdjclssdl"
                       prop="xdjclssdl"
-                      label="限电降出力损失电量"
-                      width="120"
+                      label="限电降出力损失"
+                      width="85"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_xdtjssdl"
                       prop="xdtjssdl"
-                      label="限电停机损失电量"
-                      width="120"
+                      label="限电停机损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_dfssdl"
                       prop="dfssdl"
-                      label="待风损失电量"
-                      width="120"
+                      label="待风损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_sdtjssdl"
                       prop="sdtjssdl"
-                      label="手动停机损失电量"
-                      width="120"
+                      label="手动停机损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_zcfdssdl"
                       prop="zcfdssdl"
-                      label="正常发电损失电量"
-                      width="120"
+                      label="正常发电损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_qxjclssdl"
                       prop="qxjclssdl"
-                      label="缺陷降出力损失电量"
-                      width="120"
+                      label="缺陷降出力"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_fnlyl"
                       prop="fnlyl"
                       label="风能利用率"
-                      width="120"
+                      width="75"
                     >
                     </el-table-column>
                   </el-table-column>
@@ -358,11 +388,11 @@
             >
               <el-card
                 shadow="always"
-                style="width: 45%; display: table-cell; vertical-align: middle"
+                style="width: 40%; display: table-cell; vertical-align: middle"
                 
               >
                 <div
-                  style="width: 800px; margin: auto;"
+                  style="width: 100%; margin: auto;"
                   :style="{height : judge === true ? '1200px' : '600px'}"
                   id="histogram_jdxl"
                 >
@@ -371,118 +401,134 @@
 
               <el-card
                 shadow="always"
-                style="width: 45%"
+                style="width: 58%"
                 id="moban"
               >
                 <el-table
                   id="xl_table"
                   :data="xl_date"
-                  style="width: 100%"
+                  style="width: 100%;font-size:1px;margin-bottom:10px"
                   max-height="1200px"
+                  
                 >
                   <el-table-column label="项目列表">
-                    <el-table-column fixed type="index" width="45">
+                      <el-table-column fixed type="index" width="36">
                     </el-table-column>
-                    <el-table-column prop="generation" label="名称" width="150">
+                    <el-table-column prop="generation" label="名称" width="95">
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_llfdl"
                       prop="llfdl"
                       label="理论发电量"
-                      width="120"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_scadafdl"
                       prop="scadafdl"
-                      label="SCADA发电量"
-                      width="120"
+                      label="发电量"
+                      width="75"
                     >
                     </el-table-column>
-                    <el-table-column prop="speed" label="风速" width="120">
+                    <el-table-column :formatter="filter_speed" prop="speed" label="风速" width="55">
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_gzssdl"
                       prop="gzssdl"
-                      label="故障损失电量"
-                      width="300"
+                      label="故障损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_gzslssdl"
                       prop="gzslssdl"
-                      label="故障受累损失电量"
-                      width="120"
+                      label="故障受累损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                     :formatter="filter_jxssdl"
                       prop="jxssdl"
-                      label="检修损失电量"
-                      width="120"
+                      label="检修损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_jxslssdl"
                       prop="jxslssdl"
-                      label="检修受累损失电量"
-                      width="120"
+                      label="检修受累损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_dwslssdl"
                       prop="dwslssdl"
-                      label="电网受累损失电量"
-                      width="120"
+                      label="电网受累损失"
+                      width="75"
                     >
                     </el-table-column>
                     <el-table-column
+                     :formatter="filter_hjslssdl"
                       prop="hjslssdl"
-                      label="环境受累损失电量"
-                      width="120"
+                      label="环境受累损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_xdjclssdl"
                       prop="xdjclssdl"
-                      label="限电降出力损失电量"
-                      width="120"
+                      label="限电降出力损失"
+                      width="85"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_xdtjssdl"
                       prop="xdtjssdl"
-                      label="限电停机损失电量"
-                      width="120"
+                      label="限电停机损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_dfssdl"
                       prop="dfssdl"
-                      label="待风损失电量"
-                      width="120"
+                      label="待风损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_sdtjssdl"
                       prop="sdtjssdl"
-                      label="手动停机损失电量"
-                      width="120"
+                      label="手动停机损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_zcfdssdl"
                       prop="zcfdssdl"
-                      label="正常发电损失电量"
-                      width="120"
+                      label="正常发电损失"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_qxjclssdl"
                       prop="qxjclssdl"
-                      label="缺陷降出力损失电量"
-                      width="120"
+                      label="缺陷降出力"
+                      width="75"
                     >
                     </el-table-column>
 
                     <el-table-column
+                      :formatter="filter_fnlyl"
                       prop="fnlyl"
                       label="风能利用率"
-                      width="120"
+                      width="75"
                     >
                     </el-table-column>
                   </el-table-column>
@@ -551,7 +597,54 @@ export default {
   },
   methods: {
     onSubmit() {
-      console.log("submit!");
+    },
+    filter_llfdl(cellValue){
+             return parseFloat(cellValue.llfdl).toFixed(2);
+    },
+    filter_scadafdl(cellValue){
+             return parseFloat(cellValue.scadafdl).toFixed(2);
+    },
+    filter_speed(cellValue){
+             return parseFloat(cellValue.speed).toFixed(2);
+    },
+    filter_gzssdl(cellValue){
+             return parseFloat(cellValue.gzssdl).toFixed(2);
+    },
+    filter_gzslssdl(cellValue){
+             return parseFloat(cellValue.gzslssdl).toFixed(2);
+    },
+    filter_jxssdl(cellValue){
+             return parseFloat(cellValue.jxssdl).toFixed(2);
+    },
+    filter_jxslssdl(cellValue){
+             return parseFloat(cellValue.jxslssdl).toFixed(2);
+    },
+    filter_dwslssdl(cellValue){
+             return parseFloat(cellValue.dwslssdl).toFixed(2);
+    },
+    filter_hjslssdl(cellValue){
+             return parseFloat(cellValue.hjslssdl).toFixed(2);
+    },
+    filter_xdjclssdl(cellValue){
+             return parseFloat(cellValue.xdjclssdl).toFixed(2);
+    },
+    filter_xdtjssdl(cellValue){
+             return parseFloat(cellValue.xdtjssdl).toFixed(2);
+    },
+    filter_dfssdl(cellValue){
+             return parseFloat(cellValue.dfssdl).toFixed(2);
+    },
+    filter_sdtjssdl(cellValue){
+             return parseFloat(cellValue.sdtjssdl).toFixed(2);
+    },
+    filter_zcfdssdl(cellValue){
+             return parseFloat(cellValue.zcfdssdl).toFixed(2);
+    },
+    filter_qxjclssdl(cellValue){
+             return parseFloat(cellValue.qxjclssdl).toFixed(2);
+    },
+    filter_fnlyl(cellValue){
+             return parseFloat(cellValue.fnlyl).toFixed(2);
     },
     handleClick(tab) {
       if (tab.name === "first") {
@@ -624,7 +717,6 @@ export default {
           } else if (this.tableid === "pj") {
             that.drawhistogram_pj(this.powerAjaxDetailAll);
           } else if (this.tableid === "xl") {
-            console.log(this.powerAjaxDetailAll);
             this.autoHeight = 1200;
             that.drawhistogram_xl(this.powerAjaxDetailAll);
           }
@@ -653,7 +745,7 @@ export default {
     },
     async queryPowerAll() {
       this.judge = false;
-      this.autoHeight = 900;
+      this.autoHeight = 600;
       this.resetdata();
       let that = this;
        if (this.beginDate == "" || this.endDate == "" || this.beginDate == undefined || this.endDate == undefined) {
@@ -763,6 +855,8 @@ export default {
       this.chartLine = echarts.init(document.getElementById("histogram_fc"));
       var option;
       option = {
+        textStyle:{fontSize:10},
+        color:["#64E572","#24CBE5","#128A9D","#DDDF00","#AAAC00","#ED561A","#8E5139","#50B532","#216F0A","#048DC7","#006089","#00B3FF","#000000"],
         title: {
           text: "风机绩效榜单",
           left: 300,
@@ -798,10 +892,10 @@ export default {
           ],
         },
         grid: {
-          left: "3%",
-          right: "4%",
-          bottom: "3%",
-          containLabel: true,
+          top: "130",
+          left: "10%",
+          right: "10%",
+          bottom: "50",
         },
         xAxis: {
           type: "value",
@@ -812,7 +906,7 @@ export default {
         },
         series: [
           {
-            barWidth: 40,
+            barWidth: 30,
             name: "实发电量",
             type: "bar",
             stack: "total",
@@ -996,6 +1090,7 @@ export default {
 
       var option;
       option = {
+        color:["#64E572","#24CBE5","#128A9D","#DDDF00","#AAAC00","#ED561A","#8E5139","#50B532","#216F0A","#048DC7","#006089","#00B3FF","#000000"],
         title: {
           text: "风机绩效榜单",
           left: 300,
@@ -1031,10 +1126,10 @@ export default {
           ],
         },
         grid: {
-          left: "3%",
-          right: "4%",
-          bottom: "3%",
-          containLabel: true,
+          top: "130",
+          left: "10%",
+          right: "10%",
+          bottom: "50",
         },
         xAxis: {
           type: "value",
@@ -1232,6 +1327,7 @@ export default {
 
       var option;
       option = {
+        color:["#64E572","#24CBE5","#128A9D","#DDDF00","#AAAC00","#ED561A","#8E5139","#50B532","#216F0A","#048DC7","#006089","#00B3FF","#000000"],
         title: {
           text: "风机绩效榜单",
           left: 300,
@@ -1267,10 +1363,10 @@ export default {
           ],
         },
         grid: {
-          left: "3%",
-          right: "4%",
-          bottom: "3%",
-          containLabel: true,
+          top: "130",
+          left: "10%",
+          right: "10%",
+          bottom: "50",
         },
         xAxis: {
           type: "value",

src/views/Performance/PerformanceList.vue

@@ -112,7 +112,7 @@
 
               <el-card
                 shadow="always"
-                style="width: 45%"
+                style="width: 48%"
                 height="400px"
                 id="moban"
               >
@@ -125,49 +125,58 @@
                   <el-table-column label="项目列表">
                     <el-table-column fixed type="index" width="45">
                     </el-table-column>
-                    <el-table-column prop="wtName" label="名称" width="150">
+                    <el-table-column prop="wtName" label="名称" width="135">
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_total"
                       prop="total"
-                      label="理论发电量"
-                      width="120"
+                      label="理论发电"
+                      width="78"
                     >
                     </el-table-column>
                     <el-table-column
+                    
+                    :formatter="filter_daydl2"
                       prop="daydl2"
-                      label="SCADA发电量"
-                      width="120"
+                      label="SCADA"
+                      width="76"
                     >
                     </el-table-column>
-                    <el-table-column prop="dayspeed" label="风速" width="120">
+                    <el-table-column 
+                    :formatter="filter_dayspeed"
+                    prop="dayspeed" label="风速" width="58">
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_daynhgzssdl"
                       prop="daynhgzssdl"
                       label="非计划检修"
-                      width="300"
+                      width="98"
                     >
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_daynhwhssdl"
                       prop="daynhwhssdl"
                       label="计划检修"
-                      width="120"
+                      width="80"
                     >
                     </el-table-column>
-                    <el-table-column prop="daynhcfdl" label="受累" width="120">
+                    <el-table-column :formatter="filter_daynhcfdl" prop="daynhcfdl" label="受累" width="70">
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_daynhxdssdl"
                       prop="daynhxdssdl"
                       label="限电"
-                      width="120"
+                      width="58"
                     >
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_daynhxdssdl"
                       prop="daynhxdssdl"
                       label="性能"
-                      width="120"
+                      width="58"
                     >
                     </el-table-column>
-                    <el-table-column prop="lyl" label="风能利用率%" width="120">
+                    <el-table-column :formatter="filter_lyl" prop="lyl" label="利用率%" width="100">
                     </el-table-column>
                   </el-table-column>
                 </el-table>
@@ -188,7 +197,7 @@
                 shadow="always"
                 style="
                   height: 440px;
-                  width: 45%;
+                  width: 48%;
                   display: table-cell;
                   vertical-align: middle;
                 "
@@ -201,7 +210,7 @@
 
               <el-card
                 shadow="always"
-                style="width: 45%"
+                style="width: 48%"
                 height="400px"
                 id="moban"
               >
@@ -214,49 +223,58 @@
                   <el-table-column label="项目列表">
                     <el-table-column fixed type="index" width="45">
                     </el-table-column>
-                    <el-table-column prop="wtName" label="名称" width="150">
+                    <el-table-column prop="wtName" label="名称" width="125">
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_total"
                       prop="total"
-                      label="理论发电量"
-                      width="120"
+                      label="理论发电"
+                      width="78"
                     >
                     </el-table-column>
                     <el-table-column
+                    
+                    :formatter="filter_daydl2"
                       prop="daydl2"
-                      label="SCADA发电量"
-                      width="120"
+                      label="SCADA"
+                      width="76"
                     >
                     </el-table-column>
-                    <el-table-column prop="dayspeed" label="风速" width="120">
+                    <el-table-column 
+                    :formatter="filter_dayspeed"
+                    prop="dayspeed" label="风速" width="58">
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_daynhgzssdl"
                       prop="daynhgzssdl"
                       label="非计划检修"
-                      width="300"
+                      width="98"
                     >
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_daynhwhssdl"
                       prop="daynhwhssdl"
                       label="计划检修"
-                      width="120"
+                      width="80"
                     >
                     </el-table-column>
-                    <el-table-column prop="daynhcfdl" label="受累" width="120">
+                    <el-table-column :formatter="filter_daynhcfdl" prop="daynhcfdl" label="受累" width="70">
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_daynhxdssdl"
                       prop="daynhxdssdl"
                       label="限电"
-                      width="120"
+                      width="58"
                     >
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_daynhxdssdl"
                       prop="daynhxdssdl"
                       label="性能"
-                      width="120"
+                      width="58"
                     >
                     </el-table-column>
-                    <el-table-column prop="lyl" label="风能利用率%" width="120">
+                    <el-table-column :formatter="filter_lyl" prop="lyl" label="利用率%" width="100">
                     </el-table-column>
                   </el-table-column>
                 </el-table>
@@ -276,7 +294,7 @@
               <el-card
                 shadow="always"
                 style="
-                  width: 45%;
+                  width: 48%;
                   display: table-cell;
                   vertical-align: middle;
                 "
@@ -290,7 +308,7 @@
 
               <el-card
                 shadow="always"
-                style="width: 45%"
+                style="width: 48%"
                 height="400px"
                 id="moban"
               >
@@ -298,54 +316,63 @@
                   id="xl_table"
                   :data="xl_date"
                   style="width: 100%"
-                  max-height="600px"
+                  max-height="1200px"
                 >
                   <el-table-column label="项目列表">
                     <el-table-column fixed type="index" width="45">
                     </el-table-column>
-                    <el-table-column prop="wtName" label="名称" width="150">
+                    <el-table-column prop="wtName" label="名称" width="153">
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_total"
                       prop="total"
-                      label="理论发电量"
-                      width="120"
+                      label="理论发电"
+                      width="78"
                     >
                     </el-table-column>
                     <el-table-column
+                    
+                    :formatter="filter_daydl2"
                       prop="daydl2"
-                      label="SCADA发电量"
-                      width="120"
+                      label="SCADA"
+                      width="76"
                     >
                     </el-table-column>
-                    <el-table-column prop="dayspeed" label="风速" width="120">
+                    <el-table-column 
+                    :formatter="filter_dayspeed"
+                    prop="dayspeed" label="风速" width="58">
                     </el-table-column>
                     <el-table-column
+                      :formatter="filter_daynhgzssdl"
                       prop="daynhgzssdl"
                       label="非计划检修"
-                      width="300"
+                      width="98"
                     >
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_daynhwhssdl"
                       prop="daynhwhssdl"
                       label="计划检修"
-                      width="120"
+                      width="80"
                     >
                     </el-table-column>
-                    <el-table-column prop="daynhcfdl" label="受累" width="120">
+                    <el-table-column :formatter="filter_daynhcfdl" prop="daynhcfdl" label="受累" width="70">
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_daynhxdssdl"
                       prop="daynhxdssdl"
                       label="限电"
-                      width="120"
+                      width="58"
                     >
                     </el-table-column>
                     <el-table-column
+                    :formatter="filter_daynhxdssdl"
                       prop="daynhxdssdl"
                       label="性能"
-                      width="120"
+                      width="58"
                     >
                     </el-table-column>
-                    <el-table-column prop="lyl" label="风能利用率%" width="120">
+                    <el-table-column :formatter="filter_lyl" prop="lyl" label="利用率%" width="100">
                     </el-table-column>
                   </el-table-column>
                 </el-table>
@@ -371,7 +398,7 @@ export default {
         project: "NSS01_GC",
         line: "NSS01_XL",
       },
-      fc_date: [],
+      fc_date: {},
       pj_date: [],
       xl_date: [],
       beginDate: "2021-01-01",
@@ -390,7 +417,6 @@ export default {
   },
   methods: {
     onSubmit() {
-      console.log("submit!");
     },
     handleClick(tab) {
       if (tab.name === "first") {
@@ -451,8 +477,6 @@ export default {
         )
         .then((res) => {
           let that = this;
-
-          console.log(res);
           let queryAll_table = res.data.data;
           if (this.tableid === "fc") {
             that.fc_date = queryAll_table;
@@ -563,6 +587,31 @@ export default {
     queryApDataMx() {
       this.$router.push({ path: "/new_performanceList_fan" });
     },
+    filter_total(cellValue){
+             return parseFloat(cellValue.total).toFixed(2);
+    },
+    
+    filter_daydl2(cellValue){
+             return parseFloat(cellValue.daydl2).toFixed(2);
+    },
+    filter_dayspeed(cellValue){
+             return parseFloat(cellValue.dayspeed).toFixed(2);
+    },
+    filter_daynhwhssdl(cellValue){
+             return parseFloat(cellValue.daynhwhssdl).toFixed(2);
+    },
+    filter_daynhcfdl(cellValue){
+             return parseFloat(cellValue.daynhcfdl).toFixed(2);
+    },
+    filter_daynhxdssdl(cellValue){
+             return parseFloat(cellValue.daynhxdssdl).toFixed(2);
+    },
+    filter_lyl(cellValue){
+             return parseFloat(cellValue.lyl).toFixed(2);
+    },
+    filter_daynhgzssdl(cellValue){
+             return parseFloat(cellValue.daynhgzssdl).toFixed(2);
+    },
     toExcel() {
             let that = this;
             if (this.tableid === "fc") {
@@ -579,6 +628,7 @@ export default {
 
       var option;
       option = {
+        color:["#64E572","#24CBE5","#DDDF00","#ED561B","#50B432","#058DC7"],
         title: {
           text: "风机绩效榜单",
           left: 300,
@@ -721,6 +771,7 @@ export default {
 
       var option;
       option = {
+        color:["#64E572","#24CBE5","#DDDF00","#ED561B","#50B432","#058DC7"],
         title: {
           text: "风机绩效榜单",
           left: 300,
@@ -865,6 +916,7 @@ export default {
 
       var option;
       option = {
+        color:["#64E572","#24CBE5","#DDDF00","#ED561B","#50B432","#058DC7"],
         title: {
           text: "风机绩效榜单",
           left: 300,