3-30

src/views/BorderBenchmark/InnationBenchmark_particulars.vue

@@ -504,8 +504,9 @@ export default {
             multipleSelection2:[],
             orderByColumn:'',
             isAsc:'asc',
-            fdcLineData:'',
-            fdcLineData2:'',
+
+            fdcLineData:[],
+            fdcLineData2:[],
             currentPage2: 1,
             pagesize: 10,
             wpId:'',
@@ -519,8 +520,9 @@ export default {
             sortInOrde2:[],
             getTableData:[],
             fdcND:[],
-            fdcND1:'',
-            fdcND2:'',
+
+            fdcND1:[],
+            fdcND2:[],
             loading:true,
             loading2:true,
         }

src/views/BorderBenchmark/InternationalBenchmark.vue

@@ -306,7 +306,7 @@ export default {
       isAsc: "asc",
       beginDate: "",
       endDate: "",
-      gridData: "",
+      gridData: [],
       multipleSelection: [],
       sortInOrder: [],
       sortInOrderTop: [],
@@ -317,7 +317,6 @@ export default {
       fdcName2: "",
       currentPage2: 1,
       pagesize: 10,
-      fdcLineData: "",
       FClist: {
         name: "",
         id: "",
@@ -536,7 +535,7 @@ export default {
     },
     Inquire_tableDate() {
       var newData = new Date();
-       this.timedate[0] = formateDate1(newData.getTime()/1000);
+       this.timedate[0] = formateDate1((newData.getTime()-86400000)/1000);
        this.timedate[1] = formateDate1(newData.getTime()/1000);
       let that = this;
       this.$http.get("/powercompare/windfarmAjax").then((res) => {

src/views/BorderBenchmark/YardBenchmark.vue

@@ -368,7 +368,7 @@ export default {
       lineDataOption: [],
       beginDate: "2021-01-01",
       endDate: "2021-01-03",
-      fc: "MHS_FDC",
+      fc: "",
       tableData: [],
       dialogTableVisible: false,
       getChartDataValue: [],
@@ -503,7 +503,7 @@ export default {
     },
     query_fc() {
        var newData = new Date();
-       this.beginDate = formateDate1(newData.getTime()/1000);
+       this.beginDate = formateDate1((newData.getTime()-86400000)/1000);
        this.endDate = formateDate1(newData.getTime()/1000);
       this.$http.get("powercompare/windfarmAjax?").then((res) => {
         this.FClist = res.data.data;

src/views/BorderBenchmark/YardBenchmark_particulars.vue

@@ -319,12 +319,13 @@ export default {
     return {
       loading:true,
       options: [],
-      value: "",
+
+      value: [],
       timedate: [],
       multipleSelection: [],
       orderByColumn: "",
       isAsc: "asc",
-      fdcLineData: "",
+      fdcLineData: [],
       currentPage2: 1,
       pagesize: 10,
       wpId: "",
@@ -359,7 +360,6 @@ export default {
       this.dialogTableVisible = true;
 
       if (this.multipleSelection.length == 2) {
-        console.log(this.multipleSelection);
         this.fdcName1 = this.multipleSelection[0].wtName;
         this.fdcName2 = this.multipleSelection[1].wtName;
         this.sortInOrder.push(
@@ -540,7 +540,6 @@ export default {
       this.YardTableData();
     },
     filter_date(cellValue) {
-      console.log(cellValue.recordDate);
       let date = new Date(cellValue.recordDate);
       return formateDate(date / 1000);
     },

src/views/NormRanking/GoodnessfitRank.vue

@@ -43,7 +43,7 @@
             </el-form-item>
 
             <el-form-item>
-              <el-button type="primary" :plain="true">导出</el-button>
+              <el-button type="primary" @click="toExcel"  :plain="true">导出</el-button>
             </el-form-item>
 
             <el-form-item>
@@ -61,6 +61,7 @@
         <el-table
           v-loading="loading"
           :data="tableData"
+          id="tableData"
           style="width: 100%"
           :cell-style="{ textAlign: 'center' }"
           :header-cell-style="headStyle"
@@ -136,6 +137,7 @@
   </el-container>
 </template>
 <script>
+import excelHelper from "@/utils/excelHelper";
 import formateDate from "@/utils/date";
 import formateDate1 from "@/utils/date_1";
 import * as echarts from "echarts";
@@ -160,7 +162,7 @@ export default {
   methods: {
     query_fc() {
        var newData = new Date();
-       this.beginDate = formateDate1(newData.getTime()/1000);
+       this.beginDate = formateDate1((newData.getTime()-86400000)/1000);
        this.endDate = formateDate1(newData.getTime()/1000);
        this.$http.get("powercompare/windfarmAjax?").then((res) => {
        this.FClist = res.data.data;
@@ -227,6 +229,10 @@ export default {
           }
         });
     },
+    toExcel() {
+      let that = this;
+      excelHelper.exportExcel("tableData", "拟合优度排行榜", ".xls", true);
+    },
     filter_bdate(cellValue) {
       let date = new Date(cellValue.beginDate);
 
@@ -252,9 +258,9 @@ export default {
     drawhistogram() {
       var myChart;
 
-      if (myChart != null && myChart != "" && myChart != undefined) {
-        myChart.dispose();
-      }
+      // if (myChart != null && myChart != "" && myChart != undefined) {
+      //   myChart.dispose();
+      // }
       myChart= this.$echarts.init(document.getElementById('histogram'));
 
       var option;

src/views/NormRanking/Grossgeneration_Rank.vue

@@ -195,7 +195,7 @@ export default {
     },
     query_fc() {
        var newData = new Date();
-       this.beginDate = formateDate1(newData.getTime()/1000);
+       this.beginDate = formateDate1((newData.getTime()-86400000)/1000);
        this.endDate = formateDate1(newData.getTime()/1000);
       let that = this;
       let fjj="";

src/views/NormRanking/PercentageLossrRank.vue

@@ -65,7 +65,7 @@
             </el-form-item>
 
             <el-form-item>
-              <el-button type="primary" :plain="true">导出</el-button>
+              <el-button type="primary" @click="toExcel" :plain="true">导出</el-button>
             </el-form-item>
           </el-form>
         </el-row>
@@ -76,6 +76,7 @@
       <el-card style="height: 759px">
         <el-table
           :data="tableData"
+          id="tableData"
           style="width: 100%"
           :cell-style="{ textAlign: 'center' }"
           :header-cell-style="headStyle"
@@ -127,6 +128,7 @@
 <script>
 import formateDate from "@/utils/date";
 import formateDate1 from "@/utils/date_1";
+import excelHelper from "@/utils/excelHelper";
 export default {
   data() {
     return {
@@ -219,9 +221,11 @@ export default {
         )
         .then((res) => {
           this.tableData = res.data.data;
-          console.log(this.tableData);
         });
     },
+    toExcel() {
+      excelHelper.exportExcel("tableData", "损失率排行", ".xls", true);
+    },
     headStyle() {
       return "text-align:center";
     },
@@ -231,7 +235,7 @@ export default {
   },
   mounted() {
     var newData = new Date();
-    this.beginDate = formateDate1(newData.getTime()/1000);
+    this.beginDate = formateDate1((newData.getTime()-86400000)/1000);
     this.endDate = formateDate1(newData.getTime()/1000);
     this.query_fc();
     this.query_table();

src/views/Performance/NewPerformanceList.vue

@@ -798,20 +798,20 @@ export default {
           this.datelength = queryAll.length;
           for (let i = 0; i < queryAll.length; i++) {
             this.powerAjaxDetailAll.generation[i] = queryAll[i].generation;
-            this.powerAjaxDetailAll.sacadafdl[i] = queryAll[i].sacadafdl;
-            this.powerAjaxDetailAll.jxssdl[i] = queryAll[i].jxssdl;
-            this.powerAjaxDetailAll.jxslssdl[i] = queryAll[i].jxslssdl;
-            this.powerAjaxDetailAll.gzssdl[i] = queryAll[i].gzssdl;
-            this.powerAjaxDetailAll.gzslssdl[i] = queryAll[i].gzslssdl;
-            this.powerAjaxDetailAll.xdjclssdl[i] = queryAll[i].xdjclssdl;
-            this.powerAjaxDetailAll.xdtjssdl[i] = queryAll[i].xdtjssdl;
-            this.powerAjaxDetailAll.dwslssdl[i] = queryAll[i].dwslssdl;
-            this.powerAjaxDetailAll.hjslssdl[i] = queryAll[i].hjslssdl;
-            this.powerAjaxDetailAll.dfssdl[i] = queryAll[i].dfssdl;
-            this.powerAjaxDetailAll.sdtjssdl[i] = queryAll[i].sdtjssdl;
-            this.powerAjaxDetailAll.zcfdssdl[i] = queryAll[i].zcfdssdl;
-            this.powerAjaxDetailAll.qxjclssdl[i] = queryAll[i].qxjclssdl;
-            this.powerAjaxDetailAll.llfdl[i] = queryAll[i].llfdl;
+            this.powerAjaxDetailAll.sacadafdl[i] = queryAll[i].scadafdl.toFixed(2);
+            this.powerAjaxDetailAll.jxssdl[i] = queryAll[i].jxssdl.toFixed(2);
+            this.powerAjaxDetailAll.jxslssdl[i] = queryAll[i].jxslssdl.toFixed(2);
+            this.powerAjaxDetailAll.gzssdl[i] = queryAll[i].gzssdl.toFixed(2);
+            this.powerAjaxDetailAll.gzslssdl[i] = queryAll[i].gzslssdl.toFixed(2);
+            this.powerAjaxDetailAll.xdjclssdl[i] = queryAll[i].xdjclssdl.toFixed(2);
+            this.powerAjaxDetailAll.xdtjssdl[i] = queryAll[i].xdtjssdl.toFixed(2);
+            this.powerAjaxDetailAll.dwslssdl[i] = queryAll[i].dwslssdl.toFixed(2);
+            this.powerAjaxDetailAll.hjslssdl[i] = queryAll[i].hjslssdl.toFixed(2);
+            this.powerAjaxDetailAll.dfssdl[i] = queryAll[i].dfssdl.toFixed(2);
+            this.powerAjaxDetailAll.sdtjssdl[i] = queryAll[i].sdtjssdl.toFixed(2);
+            this.powerAjaxDetailAll.zcfdssdl[i] = queryAll[i].zcfdssdl.toFixed(2);
+            this.powerAjaxDetailAll.qxjclssdl[i] = queryAll[i].qxjclssdl.toFixed(2);
+            this.powerAjaxDetailAll.llfdl[i] = queryAll[i].llfdl.toFixed(2);
           }
           if (this.tableid === "fc") {
             that.drawhistogram_fc(this.powerAjaxDetailAll);
@@ -895,20 +895,20 @@ export default {
             
             for (let i = 0; i < queryAll.length; i++) {
               this.powerAjaxDetailAll.generation[i] = queryAll[i].generation;
-              this.powerAjaxDetailAll.sacadafdl[i] = queryAll[i].sacadafdl;
-              this.powerAjaxDetailAll.jxssdl[i] = queryAll[i].jxssdl;
-              this.powerAjaxDetailAll.jxslssdl[i] = queryAll[i].jxslssdl;
-              this.powerAjaxDetailAll.gzssdl[i] = queryAll[i].gzssdl;
-              this.powerAjaxDetailAll.gzslssdl[i] = queryAll[i].gzslssdl;
-              this.powerAjaxDetailAll.xdjclssdl[i] = queryAll[i].xdjclssdl;
-              this.powerAjaxDetailAll.xdtjssdl[i] = queryAll[i].xdtjssdl;
-              this.powerAjaxDetailAll.dwslssdl[i] = queryAll[i].dwslssdl;
-              this.powerAjaxDetailAll.hjslssdl[i] = queryAll[i].hjslssdl;
-              this.powerAjaxDetailAll.dfssdl[i] = queryAll[i].dfssdl;
-              this.powerAjaxDetailAll.sdtjssdl[i] = queryAll[i].sdtjssdl;
-              this.powerAjaxDetailAll.zcfdssdl[i] = queryAll[i].zcfdssdl;
-              this.powerAjaxDetailAll.qxjclssdl[i] = queryAll[i].qxjclssdl;
-              this.powerAjaxDetailAll.llfdl[i] = queryAll[i].llfdl;
+              this.powerAjaxDetailAll.sacadafdl[i] = queryAll[i].scadafdl.toFixed(2);
+              this.powerAjaxDetailAll.jxssdl[i] = queryAll[i].jxssdl.toFixed(2);
+              this.powerAjaxDetailAll.jxslssdl[i] = queryAll[i].jxslssdl.toFixed(2);
+              this.powerAjaxDetailAll.gzssdl[i] = queryAll[i].gzssdl.toFixed(2);
+              this.powerAjaxDetailAll.gzslssdl[i] = queryAll[i].gzslssdl.toFixed(2);
+              this.powerAjaxDetailAll.xdjclssdl[i] = queryAll[i].xdjclssdl.toFixed(2);
+              this.powerAjaxDetailAll.xdtjssdl[i] = queryAll[i].xdtjssdl.toFixed(2);
+              this.powerAjaxDetailAll.dwslssdl[i] = queryAll[i].dwslssdl.toFixed(2);
+              this.powerAjaxDetailAll.hjslssdl[i] = queryAll[i].hjslssdl.toFixed(2);
+              this.powerAjaxDetailAll.dfssdl[i] = queryAll[i].dfssdl.toFixed(2);
+              this.powerAjaxDetailAll.sdtjssdl[i] = queryAll[i].sdtjssdl.toFixed(2);
+              this.powerAjaxDetailAll.zcfdssdl[i] = queryAll[i].zcfdssdl.toFixed(2);
+              this.powerAjaxDetailAll.qxjclssdl[i] = queryAll[i].qxjclssdl.toFixed(2);
+              this.powerAjaxDetailAll.llfdl[i] = queryAll[i].llfdl.toFixed(2);
             }
             if (this.tableid === "fc") {
               that.drawhistogram_fc(this.powerAjaxDetailAll);
@@ -1027,7 +1027,7 @@ export default {
             type: "bar",
             stack: "total",
             label: {
-              show: false,
+              show: true,
             },
             emphasis: {
               focus: "series",
@@ -1262,7 +1262,7 @@ export default {
             type: "bar",
             stack: "total",
             label: {
-              show: false,
+              show: true,
             },
             emphasis: {
               focus: "series",
@@ -1498,7 +1498,7 @@ export default {
             type: "bar",
             stack: "total",
             label: {
-              show: false,
+              show: true,
             },
             emphasis: {
               focus: "series",

src/views/Performance/PerformanceList.vue

@@ -1,4 +1,4 @@
-<template>
+  <template>
   <el-container>
     <el-header>
       <el-row>
@@ -487,13 +487,12 @@ export default {
       fc:"",
       pj:"",
       xl:"",
-      gridData: [],
       autoHeight_fc: 400,
       autoHeight_pj: 800,
       autoHeight_xl: 1200,
-      tableHeight_fc:'',
-      tableHeight_pj:'',
-      tableHeight_xl:'',
+      tableHeight_fc:460,
+      tableHeight_pj:860,
+      tableHeight_xl:1220,
       queryAll_table_lyl:[],
       wpIdslist: {
         name:"",
@@ -510,19 +509,10 @@ export default {
       fc_date: [],
       pj_date: [],
       xl_date: [],
-      tableHeight_xl:1200,
-      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: {},
       styleObject_fc: {
         height: '460px'
       },
@@ -552,7 +542,7 @@ export default {
     onSubmit() {},
     query_wpid() {
        var newData = new Date();
-       this.beginDate = formateDate1(newData.getTime()/1000);
+       this.beginDate = formateDate1((newData.getTime()-86400000)/1000);
        this.endDate = formateDate1(newData.getTime()/1000);
        this.$http.get("powercompare/windfarmAjax?").then((res) => {
        this.wpIdslist = res.data.data;
@@ -601,9 +591,9 @@ export default {
       this.autoHeight_pj = '800px';
       this.styleObject_xl.height = '1260px';
       this.autoHeight_xl = '1200px';
-      this.fc_date = "";
-      this.xl_date = "";
-      this.pj_date = "";
+      this.fc_date = [];
+      this.xl_date = [];
+      this.pj_date = [];
       //表格数据获取
       this.$http
         .get(
@@ -669,14 +659,13 @@ export default {
         this.beginDate == undefined ||
         this.endDate == undefined
       ) {
-        this.beginDate = "2021-01-01";
-        that.endDate = "2021-01-02";
+        this.query_wpid();
         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 == "" ||

src/views/ProjectBenchmark/ProjectBenchmark.vue

@@ -330,7 +330,7 @@ export default {
       isAsc: "asc",
       beginDate: "2021-01-01",
       endDate: "2021-01-04",
-      gridData: "",
+      gridData: [],
       multipleSelection: [],
       sortInOrder: [],
       sortInOrderTop: [],
@@ -341,7 +341,7 @@ export default {
       pjName2: "",
       currentPage2: 1,
       pagesize: 10,
-      fdcLineData: "",
+      fdcLineData: [],
       wpIdslist:{
         name:"",
         id:"",
@@ -411,7 +411,6 @@ export default {
       return "text-align:left";
     },
     onSubmit() {
-      console.log("submit!");
     },
     handleClick() {},
     deleteRow(index, rows) {
@@ -419,7 +418,7 @@ export default {
     },
     query_wpid() {
       var newData = new Date();
-       this.timedate[0] = formateDate1(newData.getTime()/1000);
+       this.timedate[0] = formateDate1((newData.getTime()-86400000)/1000);
        this.timedate[1] = formateDate1(newData.getTime()/1000);
       this.$http.get("powercompare/windfarmAjax?").then((res) => {
         this.wpIdslist = res.data.data;
@@ -458,7 +457,6 @@ export default {
         });
       } else {
         this.lineDataOption.push({ id: b.pjId, name: b.pjName });
-        console.log(this.lineDataOption);
         this.$router.push({
           path: "/benchmark_project_particulars",
           query: {
@@ -626,10 +624,8 @@ export default {
       }
     },
     handleCurrentChange(val) {
-      // console.log(`当前页: ${val}`);
     },
     handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
       this.pagesize = val;
     },
     changeTableSort(column) {
@@ -655,7 +651,6 @@ export default {
         this.beginDate = this.timedate[0];
         this.endDate = this.timedate[1];
       }
-      console.log(this.isAsc);
       var fiveLossData = new URLSearchParams();
       fiveLossData.append("wpId", this.fc);
       fiveLossData.append("beginDate", this.beginDate);

src/views/PropertyBenchnark/PropertBenchmark.vue

@@ -403,7 +403,7 @@
 <script>
 import * as echarts from "echarts";
 import formateDate from "@/utils/date";
-import formateDate1 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 {
@@ -418,7 +418,7 @@ export default {
       isAsc: "asc",
       beginDate: "",
       endDate: "",
-      gridData: "",
+      gridData: [],
       multipleSelection: [],
       sortInOrder: [],
       sortInOrderTop: [],
@@ -429,7 +429,6 @@ export default {
       fdcName2: "",
       currentPage2: 1,
       pagesize: 10,
-      fdcLineData: "",
       classification: [
         {
           id: "qf",
@@ -712,7 +711,7 @@ export default {
     },
     FiveLossInformation() {
       var newData = new Date();
-       this.timedate[0] = formateDate1(newData.getTime()/1000);
+       this.timedate[0] = formateDate1((newData.getTime()-86400000)/1000);
        this.timedate[1] = formateDate1(newData.getTime()/1000);
       let that = this;
       this.$http.get("/powercompare/windfarmAjax").then((res) => {

src/views/PropertyBenchnark/qxt_nian.vue

@@ -51,30 +51,35 @@ export default {
         },
         series: [
           {
+            name:fj[0],
             type: "line",
             stack: "总量",
             smooth: true,
             data: lineDate.value1,
           },
           {
+            name:fj[1],
             type: "line",
             stack: "总量",
             smooth: true,
             data: lineDate.value2,
           },
           {
+            name:fj[2],
             type: "line",
             stack: "总量",
             smooth: true,
             data: lineDate.value3,
           },
           {
+            name:fj[3],
             type: "line",
             stack: "总量",
             smooth: true,
             data: lineDate.value4,
           },
           {
+            name:fj[4],
             type: "line",
             stack: "总量",
             smooth: true,

src/views/PropertyBenchnark/qxt_yue.vue

@@ -51,30 +51,35 @@ export default {
         },
         series: [
           {
+            name:fj[0],
             type: "line",
             stack: "总量",
             smooth: true,
             data: lineDate.value1,
           },
           {
+            name:fj[1],
             type: "line",
             stack: "总量",
             smooth: true,
             data: lineDate.value2,
           },
           {
+            name:fj[2],
             type: "line",
             stack: "总量",
             smooth: true,
             data: lineDate.value3,
           },
           {
+            name:fj[3],
             type: "line",
             stack: "总量",
             smooth: true,
             data: lineDate.value4,
           },
           {
+            name:fj[4],
             type: "line",
             stack: "总量",
             smooth: true,

src/views/SinglePerformanceAnalysis/PowerChart.vue

@@ -95,7 +95,7 @@
                 v-model="pj"
                 @focus="query_xml"
                 placeholder="请选择"
-                multiple-limit="5"
+                :multiple-limit="5"
               >
                 <el-option
                   v-for="item in pjIdslist"
@@ -171,7 +171,7 @@
                 v-model="xl"
                 @focus="query_xml"
                 placeholder="请选择"
-                multiple-limit="5"
+                :multiple-limit="5"
               >
                 <el-option
                   v-for="item in xlIdslist"

src/views/SinglePerformanceAnalysis/PowerandWindspeedChart.vue

@@ -24,7 +24,7 @@
         </el-form-item>
 
         <el-form-item label="风机">
-          <el-select v-model="fj" placeholder="请选择" multiple-limit="5">
+          <el-select v-model="fj" placeholder="请选择" :multiple-limit="5">
             <el-option
               v-for="item in wtIdslist"
               :key="item.id"

src/views/SinglePerformanceAnalysis/individualPandectinformation.vue

@@ -32,6 +32,7 @@
     </el-form>
     <el-table
       ref="singleTable"
+      id="tableData"
       :data="tableData"
        border
        :cell-style="{ textAlign: 'center'}" 
@@ -84,6 +85,7 @@
 import * as echarts from "echarts";
 import formateDate from "@/utils/date";
 import formateDate1 from "@/utils/date_1";
+import excelHelper from "@/utils/excelHelper";
 export default {
   data() {
     return {
@@ -130,7 +132,7 @@ export default {
       });
     },
     toExcel() {
-      excelHelper.exportExcel("datatable", "xl数据", ".xls", true);
+      excelHelper.exportExcel("tableData", "单机信息总览", ".xls", true);
     },
     query_wpid() {
         this.$http.get("powercompare/windfarmAjax?").then((res) => {

src/views/SinglePerformanceAnalysis/individualPandectinformationdetails.vue

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane label="风机运行情况" name="no_1">
         <el-card>
-          <el-form :inline="true" class="demo-form-inline">
+          <el-form :inline="true" class="demo-form-inline" >
             <el-form-item label="风场">
               <el-select
                 v-model="fc"
@@ -22,7 +22,7 @@
             </el-form-item>
 
             <el-form-item label="风机">
-              <el-select v-model="fj" placeholder="请选择" multiple-limit="5">
+              <el-select v-model="fj" placeholder="请选择" :multiple-limit="5">
                 <el-option
                   v-for="item in wtIdslist"
                   :key="item.id"
@@ -50,15 +50,19 @@
                 >查询</el-button
               >
             </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="goback">返回</el-button>
+            </el-form-item>
           </el-form>
           <el-row>
             <div
+            v-loading="loading"
               id="line_dataZoom"
               style="
                 width: 2100px;
                 height: 239px;
                 margin-left: -6%;
-                margin-top: -1%;
+                margin-bottom:-1%
               "
             ></div>
           </el-row>
@@ -229,7 +233,7 @@
           </el-form-item>
 
           <el-form-item label="风机">
-            <el-select v-model="fj" placeholder="请选择" multiple-limit="5">
+            <el-select v-model="fj" placeholder="请选择" :multiple-limit="5">
               <el-option
                 v-for="item in wtIdslist"
                 :key="item.id"
@@ -254,6 +258,9 @@
               >查询</el-button
             >
           </el-form-item>
+          <el-form-item>
+              <el-button type="primary" @click="goback">返回</el-button>
+            </el-form-item>
         </el-form>
         <el-row>
           <el-col :span="12">
@@ -624,7 +631,7 @@
         </el-row>
       </el-tab-pane>
       <el-tab-pane label="风场玫瑰图" name="no_3">
-        <el-form :inline="true" class="demo-form-inline">
+        <el-form :inline="true" class="demo-form-inline" style="margin-left: 1%">
           <el-form-item label="风场">
             <el-select
               v-model="fc"
@@ -656,6 +663,9 @@
               >查询</el-button
             >
           </el-form-item>
+          <el-form-item>
+              <el-button type="primary" @click="goback">返回</el-button>
+            </el-form-item>
         </el-form>
         <el-row>
           <el-col :span="8"
@@ -717,7 +727,7 @@
         </el-row>
       </el-tab-pane>
       <el-tab-pane label="风机玫瑰图" name="no_4">
-        <el-form :inline="true" class="demo-form-inline">
+        <el-form :inline="true" class="demo-form-inline" style="margin-left: 1%">
           <el-form-item label="风场">
             <el-select
               v-model="fc"
@@ -736,7 +746,7 @@
           </el-form-item>
 
           <el-form-item label="风机">
-            <el-select v-model="fj" placeholder="请选择" multiple-limit="5">
+            <el-select v-model="fj" placeholder="请选择" :multiple-limit="5">
               <el-option
                 v-for="item in wtIdslist"
                 :key="item.id"
@@ -761,6 +771,9 @@
               >查询</el-button
             >
           </el-form-item>
+          <el-form-item>
+              <el-button type="primary" @click="goback">返回</el-button>
+            </el-form-item>
         </el-form>
         <el-row>
           <el-col :span="8"
@@ -822,7 +835,7 @@
         </el-row>
       </el-tab-pane>
       <el-tab-pane label="风机切入切出分析" name="no_5">
-        <el-form :inline="true" class="demo-form-inline">
+        <el-form :inline="true" class="demo-form-inline" style="margin-left: 1%">
           <el-form-item label="风场">
             <el-select
               v-model="fc"
@@ -841,7 +854,7 @@
           </el-form-item>
 
           <el-form-item label="风机">
-            <el-select v-model="fj" placeholder="请选择" multiple-limit="5">
+            <el-select v-model="fj" placeholder="请选择" :multiple-limit="5">
               <el-option
                 v-for="item in wtIdslist"
                 :key="item.id"
@@ -866,6 +879,9 @@
               >查询</el-button
             >
           </el-form-item>
+          <el-form-item>
+              <el-button type="primary" @click="goback">返回</el-button>
+            </el-form-item>
         </el-form>
         <el-row>
           <el-col :span="8"
@@ -958,6 +974,7 @@ import Fcmgt from "./individualinformation_fcmgt";
 export default {
   data() {
     return {
+      loading:true,
       activeName: "no_1",
       b: [],
       wpIdslist: {
@@ -1080,6 +1097,9 @@ export default {
   components: { Fcmgt: Fcmgt },
   created() {},
   methods: {
+    goback() {
+      this.$router.push({ path: "/individual_Pandectinformation" });
+    },
     handleClose() {},
     formatter_date(cellValue) {
       return formateDate(new Date(cellValue.warningtime) / 1000);
@@ -1109,9 +1129,11 @@ export default {
       this.data_01 = formateDate(
         new Date(this.$route.query.data.recorddate) / 1000
       );
-      this.query();
+      this.query1();
+    },
+    query(){this.fj='';
     },
-    query() {
+    query1() {
       this.wtIdslist = [];
       let that = this;
       this.$http
@@ -1234,7 +1256,15 @@ export default {
         this.query_cutin_windspeed();
       }
     },
-    query_cutin_windspeed() {
+    query_cutin_windspeed(){
+      if(this.fj==''){
+        this.$message.error("请选择风机！");
+      }else(
+        this.query_cutin_windspeed1()
+      )
+    },
+    query_cutin_windspeed1() {
+      this.loading=true;
       let that = this;
       this.qrfd = [];
       Object.assign(this.$data.zoom, this.$options.data().zoom);
@@ -1261,6 +1291,7 @@ export default {
             architect(new Date(that.zoomline_date[i].time) / 1000)
           );
         }
+        this.loading=false;
         this.draw_linedataZoom();
         this.query_power();
       });
@@ -3424,7 +3455,7 @@ export default {
   },
   mounted() {
     this.gaindate();
-    this.query_cutin_windspeed();
+    this.query_cutin_windspeed1();
     this.query_power();
     this.query_wpid();
   },