3-30 2

src/views/NormRanking/GoodnessfitRank.vue

@@ -75,16 +75,16 @@
               type="selection"
               class="selection"
               @selection-change="changeFun"
-              width="190"
+              width="60"
             >
             </el-table-column>
-            <el-table-column sortable prop="windfarm" label="风场" width="280">
+            <el-table-column sortable prop="windfarm" label="风场" width="300">
             </el-table-column>
             <el-table-column
               sortable
               prop="windturbine"
               label="风机"
-              width="280"
+              width="300"
             >
             </el-table-column>
             <el-table-column
@@ -93,7 +93,7 @@
               :formatter="filter_bdate"
               value-format="yyyy-MM-dd"
               label="起始时间"
-              width="280"
+              width="300"
             >
             </el-table-column>
             <el-table-column
@@ -102,7 +102,7 @@
               :formatter="filter_edate"
               value-format="yyyy-MM-dd"
               label="截至日期"
-              width="180"
+              width="220"
             >
             </el-table-column>
             <el-table-column
@@ -110,7 +110,7 @@
               sortable
               prop="speed"
               label="平均风速"
-              width="280"
+              width="295"
             >
             </el-table-column>
             <el-table-column
@@ -118,7 +118,7 @@
               prop="power"
               :formatter="filter_generatingCapacity"
               label="拟合优度"
-              width="280"
+              width="295"
             >
             </el-table-column>
           </el-table-column>
@@ -221,9 +221,9 @@ export default {
             let name1 = res.data.data.sers[j];
             design = h_Date[name1];
             that.histogram_Date.push({
+              type: "line",
               name: name1,
               stack: "总量",
-              type: "line",
               data: design,
             });
           }
@@ -273,7 +273,7 @@ export default {
           trigger: "axis",
         },
         legend: {
-          data: this.histogram_sers,
+          data: this.histogram_sers
         },
         grid: {
           left: "3%",
@@ -293,7 +293,7 @@ export default {
         yAxis: {
           type: "value",
         },
-        series: this.histogram_Date,
+        series:this.histogram_Date,
       };
       myChart.clear();
       option && myChart.setOption(option);

src/views/NormRanking/Grossgeneration_Rank.vue

@@ -88,16 +88,16 @@
               type="selection"
               class="selection"
               @selection-change="changeFun"
-              width="190"
+              width="60"
             >
             </el-table-column>
-            <el-table-column sortable prop="windfarm" label="风场" width="280">
+            <el-table-column sortable prop="windfarm" label="风场" width="310">
             </el-table-column>
             <el-table-column
               sortable
               prop="windturbine"
               label="风机"
-              width="280"
+              width="310"
             >
             </el-table-column>
             <el-table-column
@@ -106,7 +106,7 @@
               :formatter="filter_bdate"
               value-format="yyyy-MM-dd"
               label="起始时间"
-              width="280"
+              width="310"
             >
             </el-table-column>
             <el-table-column
@@ -115,7 +115,7 @@
               :formatter="filter_edate"
               value-format="yyyy-MM-dd"
               label="截至日期"
-              width="180"
+              width="210"
             >
             </el-table-column>
             <el-table-column
@@ -123,7 +123,7 @@
               prop="speed"
               :formatter="filter_speed"
               label="平均风速"
-              width="280"
+              width="290"
             >
             </el-table-column>
             <el-table-column

src/views/Performance/NewPerformanceList.vue

@@ -612,6 +612,9 @@ export default {
       fc:"",
       pj:"",
       xl:"",
+      tableHeight_fc:400,
+      tableHeight_pj:800,
+      tableHeight_xl:1200,
       autoHeight_fc: 400,
       autoHeight_pj: 800,
       autoHeight_xl: 1200,
@@ -653,22 +656,14 @@ export default {
         qxjclssdl: [],
         llfdl: [],
       },
-      tableHeight_xl:1200,
       fc_date: [],
       pj_date: [],
       xl_date: [],
-      beginDate: "2021-01-01",
-      endDate: "2021-01-02",
+      beginDate: "",
+      endDate: "",
       activeName: "first",
       tableid: "fc",
       celname: [],
-      histogram_fc: {},
-      histogram_xm: {},
-      histogram_jdxl: {},
-      table_fc: {},
-      table_xm: {},
-      table_jdxl: {},
-      queryAll_querybutton: {},
       datelength: 0,
     };
   },
@@ -850,14 +845,14 @@ export default {
       this.resetdata();
       let that = this;
        if (this.beginDate == "" || this.endDate == "" || this.beginDate == undefined || this.endDate == undefined) {
-        this.beginDate = "2021-01-01";
-        that.endDate =  "2021-01-02";
+        this.beginDate = this.$route.query.beginDate;
+        that.endDate =  this.$route.query.endDate;
         that.$message.error("请选时间！");
         return;
       }
-      this.fc_date = "";
-      this.xl_date = "";
-      this.pj_date = "";
+      this.fc_date = [];
+      this.xl_date = [];
+      this.pj_date = [];
       if (
         that.fc == "" ||
         that.fc == null ||
@@ -1673,6 +1668,8 @@ export default {
     },
   },
   mounted() {
+    this.beginDate = this.$route.query.beginDate,
+    this.endDate = this.$route.query.endDate,
     this.$nextTick(() => {
                  
             //后面的50：根据需求空出的高度，自行调整

src/views/Performance/PerformanceList.vue

@@ -798,7 +798,11 @@ export default {
       }
     },
     queryApDataMx() {
-      this.$router.push({ path: "/new_performanceList_fan" });
+      this.$router.push({ path: "/new_performanceList_fan" ,
+      query: {
+            beginDate : this.beginDate,
+            endDate : this.endDate
+          },});
     },
     filter_total(cellValue) {
       return parseFloat(cellValue.total).toFixed(2);