Biao 2 years ago
parent
commit
da3822398a

+ 9 - 9
src/api/wisdomOverhaul/energy/index.js

@@ -32,8 +32,8 @@ const scatterScatterWtAjax = (data) => {
 const powersaturationPowersaturationamonutlist = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `powersaturation/powersaturationamonutlist?wtId=${data.wtId}`,
-        method: "get",
+        url: `powersaturation/powersaturationamonutlist?wtId=${data.wtId}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+        method: "post",
     });
 };
 const powersaturationPowersaturationamonutchart = (data) => {
@@ -46,8 +46,8 @@ const powersaturationPowersaturationamonutchart = (data) => {
 const powersaturationPowersaturationmonthlist = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `powersaturation/powersaturationmonthlist?wtId=${data.wtId}&year=${data.year}&month=${data.month}`,
-        method: "get",
+        url: `powersaturation/powersaturationmonthlist?wtId=${data.wtId}&year=${data.year}&month=${data.month}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+        method: "post",
     });
 };
 const powersaturationPowersaturationmonthchart = (data) => {
@@ -60,8 +60,8 @@ const powersaturationPowersaturationmonthchart = (data) => {
 const powersaturationPowersaturationlist = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `powersaturation/powersaturationlist?wtId=${data.wtId}&recorddate=${data.recorddate}`,
-        method: "get",
+        url: `powersaturation/powersaturationlist?wtId=${data.wtId}&recorddate=${data.recorddate}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+        method: "post",
     });
 };
 const powersaturationPowersaturationchart = (data) => {
@@ -74,8 +74,8 @@ const powersaturationPowersaturationchart = (data) => {
 const leaderboardCurvefittingmainList = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `leaderboard/curvefittingmainList?isAsc=${data.isAsc}&wpId=${data.wpId}&recorddate=${data.recorddate}`,
-        method: "get",
+        url: `leaderboard/curvefittingmainList?isAsc=${data.isAsc}&wpId=${data.wpId}&recorddate=${data.recorddate}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+        method: "post",
     });
 };
 
@@ -95,7 +95,7 @@ export default {
     powersaturationPowersaturationlist,
     powersaturationPowersaturationchart,
     leaderboardCurvefittingmainList,
-    
+
 
 
 

+ 3 - 1
src/views/nxfx/qxpclfx.vue

@@ -91,7 +91,7 @@ export default {
       cur: 0,
       optionData: ["月曲线偏差率排行榜", "日曲线偏差率排行榜"],
       ChangZhan: [],
-      value1: "MHS_FDC",
+      value1: "CL_FDC",
       date: "",
       date2: "",
       shows: true,
@@ -177,6 +177,8 @@ export default {
           isAsc: "asc",
           wpId: this.value1,
           recorddate: date,
+            pageNum: 1,
+          pageSize:1000,
         })
         .then((res) => {
           this.tableLoading = false;

+ 2 - 0
src/views/wtSaturability/tab1.vue

@@ -188,6 +188,8 @@ export default {
 
       api.powersaturationPowersaturationamonutlist({
           wtId: this.wtId,
+           pageNum: 1,
+          pageSize:5,
       }).then((res) => {
         if(res.data)
         this.tableData.data = res.data.list;

+ 63 - 61
src/views/wtSaturability/tab2.vue

@@ -61,7 +61,10 @@
         <button class="btn green" @click="search">搜索</button>
       </div>
     </div>
-    <div class="df-table">
+    <div
+     class="df-table"
+       style="width: 100%; margin-bottom: 10px; overflow-y: auto"
+     >
       <ComTable height="35vh" :data="tableData"></ComTable>
     </div>
     <Mlc
@@ -266,10 +269,11 @@ export default {
           wtId: this.wtId,
           year: new Date(this.recorddate).getFullYear(),
           month: new Date(this.recorddate).getMonth() + 1,
+          pageNum: 1,
+          pageSize: 5,
         })
         .then((res) => {
-            if(res.data)
-          this.tableData.data = res.data.list;
+          if (res.data) this.tableData.data = res.data.list;
           this.getChartData();
         });
 
@@ -291,71 +295,69 @@ export default {
 
     // 获取图表数据
     getChartData() {
-
-      api.powersaturationPowersaturationmonthchart({
+      api
+        .powersaturationPowersaturationmonthchart({
           wtId: this.wtId,
           year: new Date(this.recorddate).getFullYear(),
           month: new Date(this.recorddate).getMonth() + 1,
-      }).then((res) => {
-          if(res.data){
-                         const keyArray = [
-            //   {
-            //   key: "value1",
-            //   title: "风速"
-            // },
-            {
-              key: "value2",
-              title: "实际拟合功率",
-            },
-            {
-              key: "value3",
-              title: "最优拟合功率",
-            },
-            {
-              key: "value4",
-              title: "保证功率",
-            },
-          ];
-
-          let chartData = [
-            //   {
-            //   title: "风速",
-            //   // yAxisIndex: 1,
-            //    yAxisIndex: 0,
-            //   value: []
-            // },
-            {
-              title: "实际拟合功率",
-              yAxisIndex: 0,
-              value: [],
-            },
-            {
-              title: "最优拟合功率",
-              yAxisIndex: 0,
-              value: [],
-            },
-            {
-              title: "保证功率",
-              yAxisIndex: 0,
-              value: [],
-            },
-          ];
-
-          keyArray.forEach((keyEle, keyIndex) => {
-            res.data.forEach((ele) => {
-              chartData[keyIndex].value.push({
-                text: "",
-                value: ele[keyEle.key],
+        })
+        .then((res) => {
+          if (res.data) {
+            const keyArray = [
+              //   {
+              //   key: "value1",
+              //   title: "风速"
+              // },
+              {
+                key: "value2",
+                title: "实际拟合功率",
+              },
+              {
+                key: "value3",
+                title: "最优拟合功率",
+              },
+              {
+                key: "value4",
+                title: "保证功率",
+              },
+            ];
+
+            let chartData = [
+              //   {
+              //   title: "风速",
+              //   // yAxisIndex: 1,
+              //    yAxisIndex: 0,
+              //   value: []
+              // },
+              {
+                title: "实际拟合功率",
+                yAxisIndex: 0,
+                value: [],
+              },
+              {
+                title: "最优拟合功率",
+                yAxisIndex: 0,
+                value: [],
+              },
+              {
+                title: "保证功率",
+                yAxisIndex: 0,
+                value: [],
+              },
+            ];
+
+            keyArray.forEach((keyEle, keyIndex) => {
+              res.data.forEach((ele) => {
+                chartData[keyIndex].value.push({
+                  text: "",
+                  value: ele[keyEle.key],
+                });
               });
             });
-          });
 
-          this.chartData = chartData;
+            this.chartData = chartData;
           }
-   
-      });
-
-
+        });
 
       // let that = this;
       // that.API.requestData({

+ 2 - 0
src/views/wtSaturability/tab3.vue

@@ -265,6 +265,8 @@ export default {
         .powersaturationPowersaturationlist({
           wtId: this.wtId,
           recorddate: this.recorddate,
+             pageNum: 1,
+          pageSize:5,
         })
         .then((res) => {
           if (res.data) this.tableData.data = res.data.list;