常规上传

src/api/zhbj/index.js

@@ -1069,7 +1069,7 @@ export function apiGeWarningeconreportReport(params) {
     return request({
         baseURL: process.env.VUE_APP_API,
         // url: `WarningReport/econreport?time=${params.reportParamDate}&wtid=${params.windStation}`,
-        url: `WarningReport/getwindreport?time=${params.reportParamDate}&wtid=${params.windStation}`,
+        url: `WarningReport/getwindreport?time=${params.time}&wpid=${params.wpId}`,
         method: 'get'
     })
 }

src/views/economicsOperation/jjyxReport/index.vue

@@ -14,7 +14,7 @@
             </el-option>
           </el-select>
         </div> -->
-        <div class="station">
+        <!-- <div class="station">
           机组：
           <el-select
             v-model="windStation"
@@ -29,7 +29,7 @@
             >
             </el-option>
           </el-select>
-        </div>
+        </div> -->
         <div class="station">
           时间
           <el-date-picker
@@ -839,8 +839,9 @@ export default {
   },
 
   mounted() {
-    this.funGetStation();
-    this.renderReportPage(jsonData.data);
+    // this.funGetStation();
+    this.handleReportOp();
+    // this.renderReportPage(jsonData.data);
   },
 
   methods: {
@@ -881,7 +882,7 @@ export default {
           if (that.windList.length) {
             that.windStation = that.windList[0].id;
             that.windStationName = that.windList[0].name;
-            that.handleReportOp();
+            // that.handleReportOp();
           }
         }
       });
@@ -963,16 +964,13 @@ export default {
       }
     },
     handleReportOp() {
-      if (this.reportParamDate) {
-        // let params = {
-        //   reportParamDate: this.reportParamDate,
-        //   windStation: this.windStation,
-        // };
-        // apiGeWarningeconreportReport(params).then((res) => {
-        //   this.renderReportPage(res.data);
-        // });
-        
-      }
+        let params = {
+          time: this.reportParamDate,
+          wpId: this.reportStation
+        };
+        apiGeWarningeconreportReport(params).then((res) => {
+            this.renderReportPage(res.data);
+        });
     },
     renderReportPage(res) {
         this.reportMessage = {
@@ -1040,6 +1038,7 @@ export default {
                 three: res["状态转换率-与上月对比"]
             }
         }
+        console.log("1111===>>>>", this.reportMessage)
     },
   },
 };

src/views/economicsOperation/stationAnalyse/angleAnalysis/components/current-scatter-chart.vue

@@ -108,6 +108,12 @@ export default {
       this.$nextTick(() => {
         let charYMin = 0;
         let charDataConcatArray = [];
+        
+        const splitNumber = 5;
+
+        let leftPowerMax = 0;
+        let fsMax = 0;
+        let rightPowerMax = 0;
 
         that.chartData.forEach((ele) => {
           ele.emphasis = {
@@ -175,50 +181,46 @@ export default {
           charDataConcatArray = charDataConcatArray.concat(ele.data);
         });
 
-        for (let i = 0; i < charDataConcatArray.length; i++) {
-          if (Number(charDataConcatArray[i]) < charYMin) {
-            charYMin = Number(charDataConcatArray[i]);
+        if (that.chartData?.length) {
+          for (let i = 0; i < charDataConcatArray.length; i++) {
+            if (Number(charDataConcatArray[i]) < charYMin) {
+              charYMin = Number(charDataConcatArray[i]);
+            }
           }
-        }
-
-        if (charYMin < 0) {
-          charYMin = parseInt(charYMin + -1);
-        } else {
-          charYMin = 0;
-        }
 
-        let leftPowerData = [].concat(
-          that.chartData[0].data,
-          that.chartData[1].data,
-          that.chartData[2].data,
-          that.chartData[3].data,
-          that.chartData[4].data,
-          that.chartData[5].data
-        );
-        let fsData = that.chartData[6].data;
-        let rightPowerData = that.chartData[5].data;
-
-        const splitNumber = 5;
+          if (charYMin < 0) {
+            charYMin = parseInt(charYMin + -1);
+          } else {
+            charYMin = 0;
+          }
 
-        let leftPowerMax = 0;
-        let fsMax = 0;
-        let rightPowerMax = 0;
+          let leftPowerData = [].concat(
+            that.chartData[0].data,
+            that.chartData[1].data,
+            that.chartData[2].data,
+            that.chartData[3].data,
+            that.chartData[4].data,
+            that.chartData[5].data
+          );
+          let fsData = that.chartData[6].data;
+          let rightPowerData = that.chartData[5].data;
 
-        for (let i = 0; i < leftPowerData.length; i++) {
-          if (Number(leftPowerData[i]) > leftPowerMax) {
-            leftPowerMax = Number(leftPowerData[i]);
+          for (let i = 0; i < leftPowerData.length; i++) {
+            if (Number(leftPowerData[i]) > leftPowerMax) {
+              leftPowerMax = Number(leftPowerData[i]);
+            }
           }
-        }
 
-        for (let i = 0; i < fsData.length; i++) {
-          if (Number(fsData[i]) > fsMax) {
-            fsMax = Number(fsData[i]);
+          for (let i = 0; i < fsData.length; i++) {
+            if (Number(fsData[i]) > fsMax) {
+              fsMax = Number(fsData[i]);
+            }
           }
-        }
 
-        for (let i = 0; i < rightPowerData.length; i++) {
-          if (Number(rightPowerData[i]) > rightPowerMax) {
-            rightPowerMax = Number(rightPowerData[i]);
+          for (let i = 0; i < rightPowerData.length; i++) {
+            if (Number(rightPowerData[i]) > rightPowerMax) {
+              rightPowerMax = Number(rightPowerData[i]);
+            }
           }
         }
 

src/views/economicsOperation/stationAnalyse/angleAnalysis/index.vue

@@ -536,8 +536,8 @@ const funSubmit = (params) => {
           symbolSize: 0, //设定实心点的大小
           smooth: false, //这个是把线变成曲线
           data: bzgl,
-          xAxisIndex: 0,
-          yAxisIndex: 2,
+          // yAxisIndex: 2,
+          yAxisIndex: 0,
           // lineStyle: {
           //     color: "#f56c6c"
           // },
@@ -552,7 +552,6 @@ const funSubmit = (params) => {
           symbolSize: 0, //设定实心点的大小
           smooth: false, //这个是把线变成曲线
           data: pjfs,
-          xAxisIndex: 0,
           yAxisIndex: 1,
           // lineStyle: {
           //     color: "#f56c6c"