Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx

src/components/arcgis/MHS_FDC.vue

@@ -195,13 +195,13 @@ export default {
             that.wpnumMap = res.data.fczbmap.jczbmap;
             that.wpInfoMap = res.data.wxssmap;
             that.fjmap = res.data.fjmap[0];
+			that.when();
           }
         },
       });
     },
     when: function () {
       let jsonObj = dataService.get("arcgis-mhs");
-	  console.log(jsonObj)
       this.fans = jsonObj;
       jsonObj.forEach((item) => {
         let obj = this.fjmap.find((t) => {

src/components/arcgis/NSS_FDC.vue

@@ -195,13 +195,13 @@ export default {
             that.wpnumMap = res.data.fczbmap.jczbmap;
             that.wpInfoMap = res.data.wxssmap;
             that.fjmap = res.data.fjmap[0];
+			that.when();
           }
         },
       });
     },
     when: function () {
       let jsonObj = dataService.get("arcgis-nss");
-	  console.log(jsonObj)
       this.fans = jsonObj;
       jsonObj.forEach((item) => {
         let obj = this.fjmap.find((t) => {
@@ -247,6 +247,7 @@ export default {
             item.attributes.dur = 8;
             break;
         }
+		console.log(item.geometry.x)
         this.$refs.arcgis.addHtmlPoint(
           [item.geometry.x, item.geometry.y],
           item.attributes.code,

src/components/arcgis/QS_FDC.vue

@@ -136,13 +136,13 @@
 							that.wpnumMap = res.data.fczbmap.jczbmap;
 							that.wpInfoMap = res.data.wxssmap;
 							that.fjmap = res.data.fjmap[0];
+							that.when();
 						}
 					},
 				});
 			},
 			when: function() {
 				let jsonObj = dataService.get("arcgis-qs");
-				console.log(jsonObj)
 				this.fans = jsonObj;
 				jsonObj.forEach((item) => {
 					let obj = this.fjmap.find((t) => {
@@ -154,7 +154,6 @@
 					} else {
 						item.attributes.state = "4";
 					}
-					console.log(item.attributes.state)
 					switch (item.attributes.state) {
 						case "0": //待机
 							item.attributes.rotate = false; // 转

src/components/arcgis/SBQ_FDC.vue

@@ -195,6 +195,7 @@ export default {
             that.wpnumMap = res.data.fczbmap.jczbmap;
             that.wpInfoMap = res.data.wxssmap;
             that.fjmap = res.data.fjmap[0];
+			that.when();
           }
         },
       });

src/components/arcgis/XS_FDC.vue

@@ -195,6 +195,7 @@ export default {
             that.wpnumMap = res.data.fczbmap.jczbmap;
             that.wpInfoMap = res.data.wxssmap;
             that.fjmap = res.data.fjmap[0];
+			that.when();
           }
         },
       });

src/components/arcgis/arcgis.vue

@@ -9,7 +9,6 @@
                 </div>
             </div>
         </teleport>
-        
     </div>
 </template>
 

src/components/chart/combination/scatter-line-chart.vue

@@ -606,14 +606,24 @@ export default {
     },
     legend() {
       let result = [];
-      if (this.data && this.data.length > 0)
-        result.push(
-          this.data.map((t) => {
-            return t.title;
-          })
-        );
 
-      if (this.lineData && this.lineData.legends && this.lineData.legends.legends > 0) result.push(this.lineData.legends);
+      // if (this.data && this.data.length > 0)
+      //   result.push(
+      //     this.data.map((t) => {
+      //       return t.title;
+      //     })
+      //   );
+
+      // if (this.lineData && this.lineData.legends && this.lineData.legends.legends > 0) result.push(this.lineData.legends);
+
+      this.data.forEach((ele) => {
+        result.push(ele.title);
+      });
+
+      this.lineData.legends.forEach((ele) => {
+        result.push(ele);
+      });
+
       return result;
     },
   },
@@ -641,13 +651,15 @@ export default {
             fontSize: util.vh(16),
             color: "#fff",
           },
-          formatter: function(params) {
+          formatter(params) {
             if (params.componentType == "markLine") {
               return params.name + "<br />" + params.value;
             }
             var msg = params.seriesName + "<br />";
-            msg += params.marker + that.xTitle + "：" + params.value[0] + "<br />";
-            msg += params.marker + that.yTitle + "：" + params.value[1] + "<br />";
+            msg +=
+              params.marker + that.xTitle + "：" + params.value[0] + "<br />";
+            msg +=
+              params.marker + that.yTitle + "：" + params.value[1] + "<br />";
             return msg;
           },
           axisPointer: {
@@ -749,7 +761,7 @@ export default {
       chart.clear();
       chart.setOption(option);
 
-      this.resize = function() {
+      this.resize = function () {
         chart.resize();
       };
 

src/components/coms/table/table-qc.vue

@@ -491,7 +491,7 @@ export default {
 
 <style lang="less">
 .chart {
-  width: 1000px;
+  width: 100%;
   height: 500px;
 }
 </style>

src/views/Home/components/power-review.vue

@@ -120,7 +120,6 @@ export default {
 
   watch: {
     data(res) {
-      console.log(11111, res);
       this.PowerLoad = res;
     },
     id(res) {

src/views/WindSite/pages/Map.vue

@@ -312,7 +312,8 @@ export default {
       });
     },
     when: function () {
-      let jsonObj = dataService.get("arcgis-nx-fc1");
+		console.log(this.wpId.toLowerCase())
+      let jsonObj = dataService.get("arcgis-mhs");
       this.fans = jsonObj;
       jsonObj.forEach((item) => {
         let obj = this.fjmap.find((t) => {
@@ -366,7 +367,7 @@ export default {
           false
         );
       });
-      let lineJsonObj = dataService.get("arcgis-nx-fc1-line");
+      let lineJsonObj = dataService.get("arcgis-mhs-line");
       this.$refs.arcgis.addFanByJson(jsonObj, lineJsonObj);
     },
     clickMap: function (info) {

src/views/performanceAnalysis/index.vue

@@ -5,15 +5,31 @@
         <div class="query-item">
           <div class="lable">场站：</div>
           <div class="search-input">
-            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="wpId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in wpArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">日期：</div>
           <div class="search-input">
-            <el-date-picker v-model="recorddate" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+            <el-date-picker
+              v-model="recorddate"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              popper-class="date-select"
+            >
             </el-date-picker>
           </div>
         </div>
@@ -26,37 +42,77 @@
     <div class="df-table">
       <ComTable height="78vh" :data="tableData"></ComTable>
     </div>
-    <el-dialog title="单机历史性能分析" v-model="dialogShow" width="85%" top="10vh" custom-class="modal"
-      :close-on-click-modal="true" @closed="dialogType = ''">
+    <el-dialog
+      title="单机历史性能分析"
+      v-model="dialogShow"
+      width="85%"
+      top="10vh"
+      custom-class="modal"
+      :close-on-click-modal="true"
+      @closed="dialogType = ''"
+    >
       <div class="query mg-b-8">
         <div class="query-items">
           <div class="query-item">
             <div class="lable">场站：</div>
             <div class="search-input">
-              <el-select v-model="wpId2" clearable placeholder="请选择" popper-class="select" @change="reGetWtArray">
-                <el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
+              <el-select
+                v-model="wpId2"
+                clearable
+                placeholder="请选择"
+                popper-class="select"
+                @change="reGetWtArray"
+              >
+                <el-option
+                  v-for="item in wpArray"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.name"
+                />
               </el-select>
             </div>
           </div>
           <div class="query-item">
             <div class="lable">风机：</div>
             <div class="search-input">
-              <el-select v-model="wtId" clearable placeholder="请选择" popper-class="select">
-                <el-option v-for="item in wtArray" :key="item.id" :value="item.id" :label="item.name" />
+              <el-select
+                v-model="wtId"
+                clearable
+                placeholder="请选择"
+                popper-class="select"
+              >
+                <el-option
+                  v-for="item in wtArray"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.name"
+                />
               </el-select>
             </div>
           </div>
           <div class="query-item">
             <div class="lable">开始日期：</div>
             <div class="search-input">
-              <el-date-picker v-model="beginDate" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+              <el-date-picker
+                v-model="beginDate"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="选择日期"
+                popper-class="date-select"
+              >
               </el-date-picker>
             </div>
           </div>
           <div class="query-item">
             <div class="lable">结束日期：</div>
             <div class="search-input">
-              <el-date-picker v-model="endDate" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+              <el-date-picker
+                v-model="endDate"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="选择日期"
+                popper-class="date-select"
+              >
               </el-date-picker>
             </div>
           </div>
@@ -79,11 +135,11 @@ export default {
 
   // 使用组件
   components: {
-    ComTable
+    ComTable,
   },
 
   // 数据
-  data () {
+  data() {
     const that = this;
     return {
       isAsc: "asc",
@@ -92,7 +148,9 @@ export default {
       wpId: "",
       wtId: "",
       wpId2: "",
-      recorddate: new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd"),
+      recorddate: new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
+        "yyyy-MM-dd"
+      ),
       beginDate: "",
       endDate: "",
       dialogShow: false,
@@ -104,102 +162,102 @@ export default {
             field: "windturbineid",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "型号",
             field: "modelid",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日排行榜",
             field: "daytop",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日拟合优度(%)",
             field: "daygoodness",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日风速(m/s)",
             field: "dayspeed",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "月排行榜",
             field: "monthtop",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "月拟合优度(%)",
             field: "monthgoodness",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "月风速(m/s)",
             field: "monthspeed",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "年排行榜",
             field: "yeartop",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "年拟合优度(%)",
             field: "yeargoodness",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "年风速(m/s)",
             field: "yearspeed",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "操作",
             field: "",
             is_num: false,
             is_light: false,
-            template () {
+            template() {
               return "<el-button type='text' style='cursor: pointer;'>详情</el-button>";
             },
-            click (e, row) {
+            click(e, row) {
               that.jumpUrl(row);
-            }
+            },
           },
           {
             name: "操作",
             field: "",
             is_num: false,
             is_light: false,
-            template () {
+            template() {
               return "<el-button type='text' style='cursor: pointer;'>历史</el-button>";
             },
-            click (e, row) {
+            click(e, row) {
               that.getOutputspeedHistoryList(row);
-            }
-          }
+            },
+          },
         ],
         data: [],
       },
@@ -211,147 +269,147 @@ export default {
             field: "time",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "风机",
             field: "windturbineid",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日发电量",
             field: "c1",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日理论发电量",
             field: "c2",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日平均功率",
             field: "c3",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日运行小时",
             field: "c4",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日待机小时",
             field: "c5",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日故障小时",
             field: "c6",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日维护小时",
             field: "c7",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日终端小时",
             field: "c8",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日有效风时",
             field: "c9",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日损失电量",
             field: "c10",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日报警次数",
             field: "c11",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日停机次数",
             field: "c12",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日不饱和次数",
             field: "c13",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日设备可利用率",
             field: "c14",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日平均温度",
             field: "c15",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日平均湿度",
             field: "c16",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日平均压强",
             field: "c17",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日拟合优度",
             field: "c18",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "日实际/保证",
             field: "c19",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
         ],
         data: [],
@@ -362,24 +420,24 @@ export default {
   // 函数
   methods: {
     // 请求服务
-    requestData () {
+    requestData() {
       let that = this;
       that.API.requestData({
         method: "GET",
         subUrl: "powercompare/windfarmAjax",
-        success (res) {
+        success(res) {
           that.wpArray = res.data;
           that.wpId = res.data[0].id;
-          that.getOutputSpeedList(that.wpId)
-        }
+          that.getOutputSpeedList(that.wpId);
+        },
       });
     },
 
-    getOutputSpeedList (wpId) {
+    getOutputSpeedList(wpId) {
       let that = this;
       if (!that.wpId || !that.recorddate) {
         that.BASE.showMsg({
-          msg: "场站与日期不可为空"
+          msg: "场站与日期不可为空",
         });
       } else {
         that.API.requestData({
@@ -388,31 +446,30 @@ export default {
           data: {
             wpId,
             isAsc: that.isAsc,
-            recorddate: that.recorddate
+            recorddate: that.recorddate,
           },
-          success (res) {
+          success(res) {
             that.tableData.data = res.data.list;
-          }
+          },
         });
       }
-
     },
 
-    getOutputspeedHistoryList (item) {
+    getOutputspeedHistoryList(item) {
       let that = this;
 
       that.API.requestData({
         method: "GET",
         subUrl: "powercompare/windturbineAjax",
         data: {
-          wpId: item.windtpowerstationid
+          wpId: item.windtpowerstationid,
         },
-        success (res) {
+        success(res) {
           that.wtArray = res.data;
 
           that.wpId2 = item.windtpowerstationid;
           that.wtId = item.windturbineid;
-          that.beginDate = (new Date().formatDate("yyyy-MM") + '-01');
+          that.beginDate = new Date().formatDate("yyyy-MM") + "-01";
           that.endDate = new Date().formatDate("yyyy-MM-dd");
 
           that.API.requestData({
@@ -422,137 +479,140 @@ export default {
               wpId: that.wpId2,
               wtId: that.wtId,
               beginDate: that.beginDate,
-              endDate: that.endDate
+              endDate: that.endDate,
             },
-            success (res) {
-              res.data.forEach(ele => {
+            success(res) {
+              res.data.forEach((ele) => {
                 ele.time = new Date(ele.recorddate).formatDate("yyyy-MM-dd");
               });
               that.historyTableData.data = res.data;
               that.dialogShow = true;
-            }
+            },
           });
-        }
+        },
       });
     },
 
-    reGetWtArray () {
+    reGetWtArray() {
       let that = this;
       that.API.requestData({
         method: "GET",
         subUrl: "powercompare/windturbineAjax",
         data: {
-          wpId: that.wpId2
+          wpId: that.wpId2,
         },
-        success (res) {
+        success(res) {
           that.wtArray = res.data;
           that.wtId = res.data[0].id;
-        }
+        },
       });
     },
 
-    reGetHistoryTableData () {
+    reGetHistoryTableData() {
       let that = this;
       if (!that.wpId2) {
         that.BASE.showMgs({
-          msg: "场站不可为空"
+          msg: "场站不可为空",
         });
       } else if (!that.wtId) {
         that.BASE.showMgs({
-          msg: "风机不可为空"
+          msg: "风机不可为空",
         });
       } else if (!that.beginDate || !that.endDate) {
         that.BASE.showMgs({
-          msg: "开始日期与结束日期不可为空"
+          msg: "开始日期与结束日期不可为空",
         });
       } else {
         that.API.requestData({
           method: "POST",
           subUrl: "goodness/goodhistorylist",
+          showLoading: true,
           data: {
             wpId: that.wpId2,
             wtId: that.wtId,
             beginDate: that.beginDate,
-            endDate: that.endDate
+            endDate: that.endDate,
           },
-          success (res) {
-            res.data.forEach(ele => {
+          success(res) {
+            res.data.forEach((ele) => {
               ele.time = new Date(ele.recorddate).formatDate("yyyy-MM-dd");
             });
             that.historyTableData.data = res.data;
             that.dialogShow = true;
-          }
+          },
         });
       }
     },
 
-    search () {
+    search() {
       this.getOutputSpeedList(this.wpId);
     },
 
     // 外围表格导出excel
-    exportExcel () {
+    exportExcel() {
       let that = this;
-      const { export_json_to_excel } = require('@tools/excel/Export2Excel.js'); // 注意这个Export2Excel路径      
+      const { export_json_to_excel } = require("@tools/excel/Export2Excel.js"); // 注意这个Export2Excel路径
 
-      // const tHeader = ['点名', '描述']; // 上面设置Excel的表格第一行的标题       
-      // const filterVal = ['id', 'name']; // 上面的index、nickName、name是tableData里对象的属性key值   
+      // const tHeader = ['点名', '描述']; // 上面设置Excel的表格第一行的标题
+      // const filterVal = ['id', 'name']; // 上面的index、nickName、name是tableData里对象的属性key值
 
-      let tHeader = []; // 上面设置Excel的表格第一行的标题       
+      let tHeader = []; // 上面设置Excel的表格第一行的标题
       let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
 
-      that.tableData.column.forEach(ele => {
+      that.tableData.column.forEach((ele) => {
         if (ele.name !== "操作") {
           tHeader.push(ele.name);
           filterVal.push(ele.field);
         }
       });
 
-      const list = that.tableData.data; //把要导出的数据tableData存到list 
+      const list = that.tableData.data; //把要导出的数据tableData存到list
       const data = that.formatJson(filterVal, list);
-      export_json_to_excel(tHeader, data, '导出的Excel'); // 最后一个是表名字
+      export_json_to_excel(tHeader, data, "导出的Excel"); // 最后一个是表名字
     },
 
     // 弹窗表格导出excel
-    exportExcel2 () {
+    exportExcel2() {
       let that = this;
-      const { export_json_to_excel } = require('@tools/excel/Export2Excel.js'); // 注意这个Export2Excel路径      
+      const { export_json_to_excel } = require("@tools/excel/Export2Excel.js"); // 注意这个Export2Excel路径
 
-      // const tHeader = ['点名', '描述']; // 上面设置Excel的表格第一行的标题       
-      // const filterVal = ['id', 'name']; // 上面的index、nickName、name是tableData里对象的属性key值   
+      // const tHeader = ['点名', '描述']; // 上面设置Excel的表格第一行的标题
+      // const filterVal = ['id', 'name']; // 上面的index、nickName、name是tableData里对象的属性key值
 
-      let tHeader = []; // 上面设置Excel的表格第一行的标题       
+      let tHeader = []; // 上面设置Excel的表格第一行的标题
       let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
 
-      that.historyTableData.column.forEach(ele => {
+      that.historyTableData.column.forEach((ele) => {
         if (ele.name !== "操作") {
           tHeader.push(ele.name);
           filterVal.push(ele.field);
         }
       });
 
-      const list = that.historyTableData.data; //把要导出的数据tableData存到list 
+      const list = that.historyTableData.data; //把要导出的数据tableData存到list
       const data = that.formatJson(filterVal, list);
-      export_json_to_excel(tHeader, data, '导出的Excel'); // 最后一个是表名字
+      export_json_to_excel(tHeader, data, "导出的Excel"); // 最后一个是表名字
     },
 
-    formatJson (filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => v[j]));
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
     },
 
     // 页面跳转
-    jumpUrl (item) {
-      this.$router.push(`/decision/performanceAnalysis/detail/${item.windtpowerstationid}/${item.windturbineid}`);
-    }
+    jumpUrl(item) {
+      this.$router.push(
+        `/decision/performanceAnalysis/detail/${item.windtpowerstationid}/${item.windturbineid}`
+      );
+    },
   },
 
-  created () {
+  created() {
     this.requestData();
   },
 
-  mounted () { },
+  mounted() {},
 
-  unmounted () { },
+  unmounted() {},
 };
 </script>
 
@@ -580,7 +640,7 @@ export default {
     margin-top: 1.481vh;
 
     &:before {
-      content: '';
+      content: "";
       width: 0.37vh;
       height: 0.37vh;
       background: @write;

src/views/powerCurve/index.vue

@@ -62,8 +62,9 @@
       </div>
     </div>
     <ScatterLineChart
-      xTitle="风速)m/s("
+      xTitle="风速(m/s)"
       yTitle="功率(kw)"
+      :showLegend="true"
       :height="'calc(100vh - 40px)'"
       :lineData="chartLineData"
       :data="chartData"
@@ -90,7 +91,7 @@ export default {
       wtArray: [],
       wpId: "",
       wtId: "",
-      recorddate: new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
+      recorddate: "2021-09" || new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
         "yyyy-MM"
       ),
       chartLineData: {
@@ -164,12 +165,14 @@ export default {
               xTitle: "风速",
               yTitle: "功率",
               legends: [],
-              data: [[], []],
+              // data: [[], []],
+              data: [[]],
             };
 
             res.data.line.forEach((ele) => {
-              chartLineData.data[0].push(ele[0]);
-              chartLineData.data[1].push(ele[1]);
+              // chartLineData.data[0].push(ele[0]);
+              // chartLineData.data[1].push(ele[1]);
+              chartLineData.data[0].push(ele[1]);
             });
 
             let chartData = [

src/views/singleAnalysis/index.vue

@@ -1,55 +1,75 @@
 <template>
   <div class="draught-fan-list">
     <div class="query mg-b-8">
-			<div class="query-items">
-				<div class="query-item">
-					<div class="lable">场站：</div>
-					<div class="search-input">
-						<el-select v-model="wpId" clearable placeholder="请选择"
-							popper-class="select">
-							<el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
-						</el-select>
-					</div>
-				</div>
-				<div class="query-item">
-					<div class="lable">日期：</div>
-					<div class="search-input">
-						<el-date-picker v-model="recorddate" type="date"
-							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
-						</el-date-picker>
-					</div>
-				</div>
-			</div>
-			<div class="query-actions">
-				<button class="btn green" @click="search()">查询</button>
-				<button class="btn green" @click="exportExcel">导出</button>
-			</div>
-		</div>
+      <div class="query-items">
+        <div class="query-item">
+          <div class="lable">场站：</div>
+          <div class="search-input">
+            <el-select
+              v-model="wpId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in wpArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
+            </el-select>
+          </div>
+        </div>
+        <div class="query-item">
+          <div class="lable">日期：</div>
+          <div class="search-input">
+            <el-date-picker
+              v-model="recorddate"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              popper-class="date-select"
+            >
+            </el-date-picker>
+          </div>
+        </div>
+      </div>
+      <div class="query-actions">
+        <button class="btn green" @click="search()">查询</button>
+        <button class="btn green" @click="exportExcel">导出</button>
+      </div>
+    </div>
     <div class="df-table">
       <ComTable height="78vh" :data="tableData">
-		  
-		  <template v-slot:tr v-if="tableData.data.length > 0">
-		  	<tr>
-		  		<td v-for="(item , index) in tableData.column" key="index">
-		  			{{tableDataEnd[item.field]}}
-		  		</td>
-		  	</tr>
-		  </template>
-		  
-	  </ComTable>
+        <template v-slot:tr v-if="tableData.data.length > 0">
+          <tr>
+            <td v-for="(item, index) in tableData.column" key="index">
+              {{ tableDataEnd[item.field] }}
+            </td>
+          </tr>
+        </template>
+      </ComTable>
     </div>
-    <el-dialog title="切入切出风速整合历史" v-model="dialogShow" width="85%" top="10vh" custom-class="modal" :close-on-click-modal="true" @closed="dialogType = ''">
+    <el-dialog
+      title="切入切出风速整合历史"
+      v-model="dialogShow"
+      width="85%"
+      top="10vh"
+      custom-class="modal"
+      :close-on-click-modal="true"
+      @closed="dialogType = ''"
+    >
       test
     </el-dialog>
-      <el-dialog
-      :title="wtId+'号风机'+year+ '年'+ month+'月运行指标性能分析'"
+    <el-dialog
+      :title="wtId + '号风机' + year + '年' + month + '月运行指标性能分析'"
       v-model="dialogVisible"
       width="70%"
       top="10vh"
       custom-class="modal"
       :close-on-click-modal="false"
     >
-    <ZnzhFx :wtId=wtId :year=year :month=month />
+      <ZnzhFx :wtId="wtId" :year="year" :month="month" />
     </el-dialog>
   </div>
 </template>
@@ -63,148 +83,150 @@ export default {
 
   // 使用组件
   components: {
-   ComTable,
-   ZnzhFx
+    ComTable,
+    ZnzhFx,
   },
 
   // 数据
   data() {
     const that = this;
     return {
-      isAsc:"asc",
-      wpArray:[],
-      wpId:"",
-          dialogVisible: false,
-          wtId:"",
-          year:"",
-          month:"",
-      recorddate:new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd"),
-      dialogShow:false,
-	  tableDataEnd: [], //合计
+      isAsc: "asc",
+      wpArray: [],
+      wpId: "",
+      dialogVisible: false,
+      wtId: "",
+      year: "",
+      month: "",
+      recorddate: new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
+        "yyyy-MM-dd"
+      ),
+      dialogShow: false,
+      tableDataEnd: [], //合计
       tableData: {
         column: [
           {
             name: "机组编号",
             field: "windturbineName",
-			cursor: 'pointer',
+            cursor: "pointer",
             is_num: false,
             is_light: false,
             sortable: true,
-            click(e, row){
-              that.goznzhfx(row)
-            }
+            click(e, row) {
+              that.goznzhfx(row);
+            },
           },
           {
             name: "实际发电量(万千瓦时)",
             field: "fdl",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "理论发电量(万千瓦时)",
             field: "llfdl",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "设备利用小时数(小时)",
             field: "lyxs",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "设备可利用率(%)",
             field: "sbklyl",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "等效可用系数(%)",
             field: "tjxs",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "平均风速(m/s)",
             field: "fs",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "小风切入风速(m/s)",
             field: "xfqr",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "有效风时数(小时)",
             field: "yxfss",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "故障损失电量(万千瓦时)",
             field: "gzss",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "调度限电损失电量(万千瓦时)",
             field: "xdss",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "计划检修损失电量(万千瓦时)",
             field: "jxss",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "性能未达标损失电量(万千瓦时)",
             field: "xnss",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "受累损失电量(万千瓦时)",
             field: "slss",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "故障停用时间(小时)",
             field: "gzxs",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "检修停用时间(小时)",
             field: "jxxs",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "机组功率一致性系数(%)",
             field: "glyzxxs",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           // {
           //   name: "操作",
@@ -212,8 +234,8 @@ export default {
           //   is_num: false,
           //   is_light: false,
           //   template() {
-					// 			return "<el-button type='text' style='cursor: pointer;'>详情</el-button>";
-					// 	},
+          // 			return "<el-button type='text' style='cursor: pointer;'>详情</el-button>";
+          // 	},
           //   click(e, row){
           //     that.getOutputspeedHistoryList(row)
           //   }
@@ -226,14 +248,12 @@ export default {
 
   // 函数
   methods: {
-    goznzhfx(row){
+    goznzhfx(row) {
       let that = this;
-      that.wtId=row.windturbineid;
-      that.year=new Date(this.recorddate).formatDate("yyyy");
-      that.month=new Date(this.recorddate).formatDate("MM");
-      // console.log(that.wtId,'--',that.year,'---', that.month)
+      that.wtId = row.windturbineid;
+      that.year = new Date(this.recorddate).formatDate("yyyy");
+      that.month = new Date(this.recorddate).formatDate("MM");
       that.dialogVisible = true;
-      console.warn(row);
       // this.$router.push({path:`/decision/znzhfx/${row.windturbineid}/${new Date(this.recorddate).formatDate("yyyy")}/${new Date(this.recorddate).formatDate("MM")}`})
     },
     // 请求服务
@@ -243,98 +263,98 @@ export default {
         method: "GET",
         subUrl: "powercompare/windfarmAjax",
         success(res) {
-          that.wpArray=res.data;
-          that.wpId=res.data[0].id;
-          that.getOutputSpeedList(that.wpId)
-        }
+          that.wpArray = res.data;
+          that.wpId = res.data[0].id;
+          that.getOutputSpeedList(that.wpId);
+        },
       });
     },
 
-    getOutputSpeedList(wpId){
+    getOutputSpeedList(wpId) {
       let that = this;
-      if(!that.wpId || !that.recorddate){
+      if (!that.wpId || !that.recorddate) {
         that.BASE.showMsg({
-          msg:"场站与日期不可为空"
+          msg: "场站与日期不可为空",
         });
-      }else{
+      } else {
         that.API.requestData({
           method: "POST",
           subUrl: "singleanalysis/singleanalysisMain",
-          data:{
+          showLoading: true,
+          data: {
             wpId,
-            isAsc:that.isAsc,
-            year:new Date(that.recorddate).getFullYear(),
-            month:(new Date(that.recorddate).getMonth() + 1)
+            isAsc: that.isAsc,
+            year: new Date(that.recorddate).getFullYear(),
+            month: new Date(that.recorddate).getMonth() + 1,
           },
           success(res) {
-            res.data.forEach(ele=>{
-              for(let key in ele){
+            res.data.forEach((ele) => {
+              for (let key in ele) {
                 ele[key] = ele[key] || 0;
               }
             });
-			that.tableDataEnd = res.data[res.data.length - 1];
-			res.data.pop();
+            that.tableDataEnd = res.data[res.data.length - 1];
+            res.data.pop();
             that.tableData.data = res.data;
-          }
+          },
         });
       }
-      
     },
 
-    getOutputspeedHistoryList (item){
+    getOutputspeedHistoryList(item) {
       let that = this;
       that.API.requestData({
         method: "POST",
         subUrl: "outputspeed/outputspeedhistorylist",
-        data:{
-          wpId:item.windpowerstationid,
-          wtId:item.windturbineid,
-          beginDate: (new Date().formatDate("yyyy-MM") + '-01'),
-          endDate: new Date().formatDate("yyyy-MM-dd")
+        data: {
+          wpId: item.windpowerstationid,
+          wtId: item.windturbineid,
+          beginDate: new Date().formatDate("yyyy-MM") + "-01",
+          endDate: new Date().formatDate("yyyy-MM-dd"),
         },
         success(res) {
-          res.data.forEach(ele=>{
+          res.data.forEach((ele) => {
             ele.time = new Date(ele.recorddate).formatDate("yyyy-MM-dd");
           });
           that.tableHistoryData.data = res.data;
           that.dialogShow = true;
-        }
+        },
       });
     },
 
-    search(){
+    search() {
       this.getOutputSpeedList(this.wpId);
     },
 
-        // 导出excel
-    exportExcel () {
+    // 导出excel
+    exportExcel() {
       let that = this;
-      const { export_json_to_excel } = require('@tools/excel/Export2Excel.js'); // 注意这个Export2Excel路径      
-      
-      // const tHeader = ['点名', '描述']; // 上面设置Excel的表格第一行的标题       
-      // const filterVal = ['id', 'name']; // 上面的index、nickName、name是tableData里对象的属性key值   
-      
-      let tHeader = []; // 上面设置Excel的表格第一行的标题       
+      const { export_json_to_excel } = require("@tools/excel/Export2Excel.js"); // 注意这个Export2Excel路径
+
+      // const tHeader = ['点名', '描述']; // 上面设置Excel的表格第一行的标题
+      // const filterVal = ['id', 'name']; // 上面的index、nickName、name是tableData里对象的属性key值
+
+      let tHeader = []; // 上面设置Excel的表格第一行的标题
       let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
 
-      that.tableData.column.forEach(ele=>{
-        if(ele.name !== "操作"){
+      that.tableData.column.forEach((ele) => {
+        if (ele.name !== "操作") {
           tHeader.push(ele.name);
           filterVal.push(ele.field);
         }
       });
 
-	  var list = [];
-	  that.tableData.data.forEach((i,index) =>{
-	  				  list.push(i);
-	  })
-	  list.push(that.tableDataEnd)
+      var list = [];
+      that.tableData.data.forEach((i, index) => {
+        list.push(i);
+      });
+      list.push(that.tableDataEnd);
       const data = that.formatJson(filterVal, list);
-      export_json_to_excel(tHeader, data, '导出的Excel'); // 最后一个是表名字
+      export_json_to_excel(tHeader, data, "导出的Excel"); // 最后一个是表名字
     },
 
-    formatJson (filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => v[j]));
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
     },
   },
 
@@ -368,10 +388,8 @@ export default {
     cursor: pointer;
     border: 0.093vh solid fade(@darkgray, 50%);
     position: relative;
-    overflow: auto;
     flex-grow: 1;
     margin-top: 1.481vh;
-  
 
     &:before {
       content: "";
@@ -389,3 +407,12 @@ export default {
   }
 }
 </style>
+<style lang="less">
+.draught-fan-list {
+  .el-dialog__body {
+    height: 600px;
+    max-height: 600px;
+    overflow-y: scroll;
+  }
+}
+</style>

src/views/singleAnalysis/znzhfx.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="znzhfx">
-     <!-- <el-col :span="24">
+    <!-- <el-col :span="24">
           <div class="back">
             <button class="btn" type="button" @click="back">
               <span>返回</span>
@@ -11,88 +11,83 @@
             {{ wtId }}号风机{{ year }}年{{ month }}月运行指标性能分析
           </div>
         </el-col> -->
-    <el-scrollbar height="910px">
-      <el-row :gutter="20" class="table-panel">
-        <el-col :span="24">
-          <div class="back">
-            <button class="btn" type="button" @click="back">
-              <span>返回</span>
-            </button>
-             <button class="btn" type="button" @click="exportPDF">
-              导出
-            </button>
-          </div>
-          <div class="table-title">
-            {{ wtId }}号风机{{ year }}年{{ month }}月运行指标性能分析
-          </div>
-          <!-- <Table :data="tableData2" :canScroll="false" /> -->
-        </el-col>
-         <Table class="pdfDom" :data="tableData2" :canScroll="false" />
-      </el-row>
-      <div class="mg-b-16 anliz-des">
-        <div>
-          本月{{ wtId }}号风机风机设备利用小时数{{
-            tableVal.byzb && tableVal.byzb.lyxs
-          }}小时、同比{{
-            tableVal.tpzb && tableVal.tpzb.lyxs
-          }}小时，设备可利用率{{
-            tableVal.byzb && tableVal.byzb.sbklyl
-          }}%、同比{{ tableVal.tpzb && tableVal.tpzb.sbklyl }}}%，
-          等效可用系数{{ tableVal.byzb && tableVal.byzb.dxklyxs }}%、同比{{
-            tableVal.tpzb && tableVal.tpzb.dxklyxs
-          }}}%，静风频率达到{{ tableVal.byzb && tableVal.byzb.jfpl }}%、同比{{
-            tableVal.tpzb && tableVal.tpzb.jfpl
-          }}}%， 机组功率特性一致性系数达到{{
-            tableVal.byzb && tableVal.byzb.glyzxxs
-          }}%、同比{{ tableVal.tpzb && tableVal.tpzb.glyzxxs }}}%。
-          <br />
-          {{ wtId }}风机{{ year }}年{{ month }}月平均风速{{
-            tableVal.byzb && tableVal.byzb.fs
-          }}m/s、同比{{ tableVal.tpzb && tableVal.tpzb.fs }}m/s，
-          小风平均切入风速{{ tableVal.byzb && tableVal.byzb.xfqr }}m/s、同比{{
-            tableVal.tpzb && tableVal.tpzb.xfqr
-          }}m/s， 有效风时数{{
-            tableVal.byzb && tableVal.byzb.yxfss
-          }}小时、同比{{ tableVal.tpzb && tableVal.tpzb.yxfss }}小时，
-          实际发电电量{{ tableVal.byzb && tableVal.byzb.fdl }}万kwh、同比{{
-            tableVal.tpzb && tableVal.tpzb.fdl
-          }}万kwh，同比增长率{{ tableVal.tbzb && tableVal.tbzb.fdl }}%，
-          各项损失电量累计{{
-            tableVal.byzb && tableVal.byzb.llfdl - tableVal.byzb.fdl
-          }}万kwh、同比{{
-            tableVal.tpzb && tableVal.tpzb.llfdl - tableVal.tpzb.fdl
-          }}万kwh，同比增长率{{
-            tableVal.tbzb && tableVal.byzb.llfdl - tableVal.tbzb.fdl
-          }}%， 理论发电量{{
-            tableVal.byzb && tableVal.byzb.llfdl
-          }}万kwh，实际发电量与理论发电量相差{{
-            tableVal.tbzb && tableVal.tbzb.llfdl
-          }}万kwh。
-          <br />
-          本月静风频率
-          %，月累计静风时长0.00小时，月累计待机小时116.44小时，待机占比48.51%。
+    <el-row :gutter="20" class="table-panel">
+      <el-col :span="24">
+        <div class="back">
+          <button class="btn" type="button" @click="back">
+            <span>返回</span>
+          </button>
+          <button class="btn" type="button" @click="exportPDF">导出</button>
         </div>
+        <div class="table-title">
+          {{ wtId }}号风机{{ year }}年{{ month }}月运行指标性能分析
+        </div>
+        <!-- <Table :data="tableData2" :canScroll="false" /> -->
+      </el-col>
+      <Table class="pdfDom" :data="tableData2" :canScroll="false" />
+    </el-row>
+    <div class="mg-b-16 anliz-des">
+      <div>
+        本月{{ wtId }}号风机风机设备利用小时数{{
+          tableVal.byzb && tableVal.byzb.lyxs
+        }}小时、同比{{
+          tableVal.tpzb && tableVal.tpzb.lyxs
+        }}小时，设备可利用率{{ tableVal.byzb && tableVal.byzb.sbklyl }}%、同比{{
+          tableVal.tpzb && tableVal.tpzb.sbklyl
+        }}%， 等效可用系数{{ tableVal.byzb && tableVal.byzb.dxklyxs }}%、同比{{
+          tableVal.tpzb && tableVal.tpzb.dxklyxs
+        }}%，静风频率达到{{ tableVal.byzb && tableVal.byzb.jfpl }}%、同比{{
+          tableVal.tpzb && tableVal.tpzb.jfpl
+        }}%， 机组功率特性一致性系数达到{{
+          tableVal.byzb && tableVal.byzb.glyzxxs
+        }}%、同比{{ tableVal.tpzb && tableVal.tpzb.glyzxxs }}%。
+        <br />
+        {{ wtId }}风机{{ year }}年{{ month }}月平均风速{{
+          tableVal.byzb && tableVal.byzb.fs
+        }}m/s、同比{{ tableVal.tpzb && tableVal.tpzb.fs }}m/s，
+        小风平均切入风速{{ tableVal.byzb && tableVal.byzb.xfqr }}m/s、同比{{
+          tableVal.tpzb && tableVal.tpzb.xfqr
+        }}m/s， 有效风时数{{ tableVal.byzb && tableVal.byzb.yxfss }}小时、同比{{
+          tableVal.tpzb && tableVal.tpzb.yxfss
+        }}小时， 实际发电电量{{
+          tableVal.byzb && tableVal.byzb.fdl
+        }}万kwh、同比{{ tableVal.tpzb && tableVal.tpzb.fdl }}万kwh，同比增长率{{
+          tableVal.tbzb && tableVal.tbzb.fdl
+        }}%， 各项损失电量累计{{
+          tableVal.byzb && tableVal.byzb.llfdl - tableVal.byzb.fdl
+        }}万kwh、同比{{
+          tableVal.tpzb && tableVal.tpzb.llfdl - tableVal.tpzb.fdl
+        }}万kwh，同比增长率{{
+          tableVal.tbzb && tableVal.byzb.llfdl - tableVal.tbzb.fdl
+        }}%， 理论发电量{{
+          tableVal.byzb && tableVal.byzb.llfdl
+        }}万kwh，实际发电量与理论发电量相差{{
+          tableVal.tbzb && tableVal.tbzb.llfdl
+        }}万kwh。
+        <br />
+        本月静风频率
+        %，月累计静风时长0.00小时，月累计待机小时116.44小时，待机占比48.51%。
       </div>
-      <div class="mg-b-16">
-        <panel :title="'损失电量分析'" :showLine="true">
-          <multiple-bar-line-chart
-            :height="'21.296vh'"
-            :barData="bar1Data"
-            :lineData="lineData"
-          />
-        </panel>
-      </div>
-      <div class="mg-b-16">
-        <panel :title="'损失电量分析'" :showLine="true">
-          <vertival-bar-line-chart :height="'21.296vh'" :bardata="bar2data" />
-        </panel>
-      </div>
-      <div class="mg-b-16">
-        <panel :title="'损失电量分析'" :showLine="true" >
-          <double-line-chart :height="'21.296vh'" :list="list" />
-        </panel>
-      </div>
-    </el-scrollbar>
+    </div>
+    <div class="mg-b-16">
+      <panel :title="'损失电量分析'" :showLine="true">
+        <multiple-bar-line-chart
+          :height="'21.296vh'"
+          :barData="bar1Data"
+          :lineData="lineData"
+        />
+      </panel>
+    </div>
+    <div class="mg-b-16">
+      <panel :title="'损失电量分析'" :showLine="true">
+        <vertival-bar-line-chart :height="'21.296vh'" :bardata="bar2data" />
+      </panel>
+    </div>
+    <div class="mg-b-16">
+      <panel :title="'损失电量分析'" :showLine="true">
+        <double-line-chart :height="'21.296vh'" :list="list" />
+      </panel>
+    </div>
   </div>
 </template>
 
@@ -113,11 +108,11 @@ export default {
     MultipleBarLineChart,
     DoubleLineChart,
   },
-  props:{
+  props: {
     wtId: "",
-      year: "",
-      month: "",
-      // dialogVisible: false,
+    year: "",
+    month: "",
+    // dialogVisible: false,
   },
   data() {
     return {
@@ -394,15 +389,23 @@ export default {
   },
   methods: {
     //导出pdf
-       exportPDF (name) {
+    exportPDF(name) {
       this.BASE.showMsg({
         type: "success",
-        msg: "正在导出...请稍后..."
+        msg: "正在导出...请稍后...",
       });
-      Get_PDF.downloadPDF(document.querySelector('.pdfDom'), this.wtId +'号风机'+ this.year+'年'+ this.month +'月运行指标性能分析');
+      Get_PDF.downloadPDF(
+        document.querySelector(".pdfDom"),
+        this.wtId +
+          "号风机" +
+          this.year +
+          "年" +
+          this.month +
+          "月运行指标性能分析"
+      );
     },
     async search() {
-      console.log(this.wtId,'--',this.year,'---',this.month)
+      console.log(this.wtId, "--", this.year, "---", this.month);
       const { data } = await this.API.requestData({
         subUrl: "/singleanalysis/singleanalysisSub",
         method: "POST",
@@ -459,7 +462,7 @@ export default {
       console.warn(arr);
     },
     async searchChart() {
-       console.log(this.wtId,'--',this.year,'---', this.month)
+      console.log(this.wtId, "--", this.year, "---", this.month);
       const { data } = await this.API.requestData({
         subUrl: "/singleanalysis/singleanalysisChart",
         method: "POST",
@@ -539,9 +542,9 @@ export default {
       this.bar2data.data = arrwsdata;
       console.warn(this.bar2data);
     },
-	back(){
-		this.$router.go(-1);
-	}
+    back() {
+      this.$router.go(-1);
+    },
   },
 };
 </script>
@@ -549,6 +552,8 @@ export default {
 <style lang="less">
 .znzhfx {
   font-size: 12px;
+  height: 100%;
+  overflow-y: scroll;
   .anliz-des {
     font-size: 16px;
     color: #b3bdc0;

src/views/windAnalysis/phdffx.vue

@@ -5,29 +5,65 @@
         <div class="query-item">
           <div class="lable">场站：</div>
           <div class="search-input">
-            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change="(wpId) => { getTurbines() }">
-              <el-option v-for="item in wpList" :key="item.id" :value="item.id" :label="item.name"></el-option>
+            <el-select
+              v-model="wpId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+              @change="
+                (wpId) => {
+                  getTurbines();
+                }
+              "
+            >
+              <el-option
+                v-for="item in wpList"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              ></el-option>
             </el-select>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">机组：</div>
           <div class="search-input">
-            <el-select v-model="wtId" placeholder="请选择" popper-class="select">
-              <el-option v-for="item in wtList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            <el-select
+              v-model="wtId"
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in wtList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
             </el-select>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">开始日期：</div>
           <div class="search-input">
-            <el-date-picker v-model="startDate" type="date" placeholder="开始日期" popper-class="date-select" value-format="YYYY-MM-DD"></el-date-picker>
+            <el-date-picker
+              v-model="startDate"
+              type="date"
+              placeholder="开始日期"
+              popper-class="date-select"
+              value-format="YYYY-MM-DD"
+            ></el-date-picker>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">结束日期：</div>
           <div class="search-input">
-            <el-date-picker v-model="endDate" type="date" placeholder="开始日期" popper-class="date-select" value-format="YYYY-MM-DD"></el-date-picker>
+            <el-date-picker
+              v-model="endDate"
+              type="date"
+              placeholder="开始日期"
+              popper-class="date-select"
+              value-format="YYYY-MM-DD"
+            ></el-date-picker>
           </div>
         </div>
         <div class="query-actions">
@@ -51,7 +87,14 @@
         <div class="chart" id="linechart3"></div>
       </panel>
     </div>
-    <el-dialog :title="'偏航对风分析明细'" v-model="dialogShow" width="80%" top="10vh" custom-class="modal dBody" :close-on-click-modal="true">
+    <el-dialog
+      :title="'偏航对风分析明细'"
+      v-model="dialogShow"
+      width="80%"
+      top="10vh"
+      custom-class="modal dBody"
+      :close-on-click-modal="true"
+    >
       <div class="chart" id="linechartDialog"></div>
     </el-dialog>
   </div>
@@ -89,6 +132,9 @@ export default {
 
     this.getCharts();
   },
+  updated() {
+    this.getCharts();
+  },
   methods: {
     // 场站
     async getStations() {
@@ -110,9 +156,11 @@ export default {
       this.wtId = res.data.data[0].id;
     },
     getCharts() {
-      this.getChart1();
-      this.getChart2();
-      this.getChart3();
+      this.$nextTick(() => {
+        this.getChart1();
+        this.getChart2();
+        this.getChart3();
+      });
     },
     async getChart1() {
       const res = await this.API.requestData({