发电效率排行模块完成

public/static/config/modeConfig.js

@@ -9,8 +9,8 @@ let baseURL = null;
 let websocketUrl = null;
 
 if (localTest) {
-  // baseURL = "http://192.168.10.23:8082/" // 联机调试 - 石林
-  baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
+  baseURL = "http://192.168.10.23:8082/" // 联机调试 - 石林
+  // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
 } else {
   baseURL = "http://10.155.32.4:8082/" // 正式环境
 }

src/views/powerRank/index.vue

@@ -83,49 +83,49 @@ export default {
         column: [
           {
             name: "风场",
-            field: "windturbineid",
+            field: "windfarm",
             is_num: false,
             is_light: false,
             sortable: true
           },
           {
             name: "风机",
-            field: "inputsmall",
+            field: "windturbine",
             is_num: false,
             is_light: false,
             sortable: true
           },
           {
             name: "起始日期",
-            field: "inputsmallratio",
+            field: "beginDate",
             is_num: false,
             is_light: false,
             sortable: true
           },
           {
             name: "截止日期",
-            field: "inputbig",
+            field: "endDate",
             is_num: false,
             is_light: false,
             sortable: true
           },
           {
             name: "平均风速",
-            field: "inputbigratio",
+            field: "speed",
             is_num: false,
             is_light: false,
             sortable: true
           },
           {
             name: "平均功率",
-            field: "outputsmall",
+            field: "power",
             is_num: false,
             is_light: false,
             sortable: true
           },
           {
             name: "平均效率",
-            field: "outputsmallratio",
+            field: "generatingCapacity",
             is_num: false,
             is_light: false,
             sortable: true
@@ -184,11 +184,17 @@ export default {
           subUrl: "leaderboard/loadfactortoplist",
           data:{
             wpId:that.wpId,
+            type:that.typeId,
             isAsc:that.isAsc,
             beginDate:that.beginDate,
-            endDate:that.endDate
+            endDate:that.endDate,
+            orderByColumn:"",
           },
           success(res) {
+            res.data.forEach(ele=>{
+              ele.beginDate=new Date(ele.beginDate).formatDate("yyyy-MM-dd");
+              ele.endDate=new Date(ele.beginDate).formatDate("yyyy-MM-dd");
+            })
             that.tableData.data = res.data;
           }
         });
@@ -230,9 +236,10 @@ export default {
   .df-table {
     border: 0.093vh solid fade(@darkgray, 50%);
     position: relative;
-    overflow: auto;
+    overflow: hidden;
     flex-grow: 1;
     margin-top: 1.481vh;
+    height:80vh;
 
     &:before {
       content: "";