智慧检修0526修改

src/App.vue

@@ -506,6 +506,13 @@ body .gfSelect .el-input__inner {
     .query-actions {
       flex: 0 0 auto;
       margin-left: 50px;
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+
+      .btn {
+        cursor: pointer;
+      }
     }
   }
 

src/api/economic/index.js

@@ -609,6 +609,13 @@ const wpwtlist = () => {
         method: "get",
     });
 };
+const getWtList = (data) => {
+    return request({
+        baseURL: "http://10.81.3.155:8172",
+        url: `/healthmain/windturbineAjax?wpId=${data.wpId}`,
+        method: "get",
+    });
+};
 //功率曲线拟合
 const curvefitting = (data) => {
     return request({
@@ -784,6 +791,7 @@ export default {
     paramComparisonEquipmentParams,
     paramComparisonGeneratingCurve,
     wpwtlist,
+    getWtList,
     curvefitting,
     getPointPerSisList,
     getpoints,

src/api/wisdomOverhaul/energy/index.js

@@ -3,81 +3,88 @@ import request from "../../../tools/request";
 
 const yawGetPassRate = (data) => {
     return request({
-        baseURL: process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
         url: `yaw/getPassRate?wtId=${data.wtId}&beginDate=${data.beginDate}&endDate=${data.endDate}&type=${data.type}`,
         method: "get",
     });
 };
 const yawGetTotalRanges = (data) => {
     return request({
-        baseURL: process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
         url: `yaw/getTotalRanges?wtId=${data.wtId}&beginDate=${data.beginDate}&endDate=${data.endDate}&type=${data.type}`,
         method: "get",
     });
 };
 const yawGetRanges = (data) => {
     return request({
-        baseURL: process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
         url: `yaw/getRanges?wtId=${data.wtId}&beginDate=${data.beginDate}&endDate=${data.endDate}&type=${data.type}&value=${data.value}`,
         method: "get",
     });
 };
 const scatterScatterWtAjax = (data) => {
     return request({
-        baseURL: process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
         url: `scatter/scatterWtAjax?wtId=${data.wtId}&year=${data.year}&month=${data.month}`,
         method: "get",
     });
 };
 const powersaturationPowersaturationamonutlist = (data) => {
     return request({
-        baseURL: process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
         url: `powersaturation/powersaturationamonutlist?wtId=${data.wtId}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
         method: "post",
     });
 };
 const powersaturationPowersaturationamonutchart = (data) => {
     return request({
-        baseURL: process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
         url: `powersaturation/powersaturationamonutchart?wtId=${data.wtId}`,
         method: "get",
     });
 };
 const powersaturationPowersaturationmonthlist = (data) => {
     return request({
-        baseURL: process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
         url: `powersaturation/powersaturationmonthlist?wtId=${data.wtId}&year=${data.year}&month=${data.month}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
         method: "post",
     });
 };
 const powersaturationPowersaturationmonthchart = (data) => {
     return request({
-        baseURL: process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
         url: `powersaturation/powersaturationmonthchart?wtId=${data.wtId}&year=${data.year}&month=${data.month}`,
         method: "get",
     });
 };
 const powersaturationPowersaturationlist = (data) => {
     return request({
-        baseURL: process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
         url: `powersaturation/powersaturationlist?wtId=${data.wtId}&recorddate=${data.recorddate}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
         method: "post",
     });
 };
 const powersaturationPowersaturationchart = (data) => {
     return request({
-        baseURL: process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
         url: `powersaturation/powersaturationchart?wtId=${data.wtId}&recorddate=${data.recorddate}`,
         method: "get",
     });
 };
-const leaderboardCurvefittingmainList = (data) => {
+const getCurvefittingmainList = (data) => {
     return request({
-        baseURL: process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
         url: `leaderboard/curvefittingmainList?isAsc=${data.isAsc}&wpId=${data.wpId}&recorddate=${data.recorddate}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
         method: "post",
     });
 };
+const getCurvefittingmonthmainList = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
+        url: `leaderboard/curvefittingmonthmainList?isAsc=${data.isAsc}&wpId=${data.wpId}&year=${data.year}&month=${data.month}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+        method: "post",
+    });
+};
 
 
 
@@ -94,9 +101,6 @@ export default {
     powersaturationPowersaturationmonthchart,
     powersaturationPowersaturationlist,
     powersaturationPowersaturationchart,
-    leaderboardCurvefittingmainList,
-
-
-
-
+    getCurvefittingmainList,
+    getCurvefittingmonthmainList
 }

src/router/index.js

@@ -977,6 +977,11 @@ const routes = [
     component: () => import("../views/wtSaturability/index.vue"),
   },
   {
+    path: "/health/nxfx/temperatureAnalysis", // 部件温度分析
+    name: "temperatureAnalysis",
+    component: () => import("../views/temperatureAnalysis/index.vue"),
+  },
+  {
     path: "/health/kkxfx/alarmcenter1",
     name: "alarmcenter1",
     component: () =>

src/views/layout/Menu.vue

@@ -388,39 +388,43 @@ export default {
             //   icon: "svg-全生命周期",
             //   path: "/health/allLifeManage",
             // },
-            // {
-            //   text: "能效分析",
-            //   icon: "svg-能效分析",
-            //   path: "/health/nxfx/powerCurve",
-            //   children: [
-            //     {
-            //       text: "功率曲线拟合",
-            //       icon: "svg-wind-site",
-            //       path: "/health/nxfx/powerCurve",
-            //     },
-            //     {
-            //       text: "偏航对风分析",
-            //       icon: "svg-wind-site",
-            //       path: "/health/nxfx/phdffx",
-            //     },
-            //     // {
-            //     //   text: "切入切出分析",
-            //     //   icon: "svg-wind-site",
-            //     //   path: "/health/nxfx/cutAnalyse",
-            //     // },
-            //     {
-            //       text: "曲线偏差率分析",
-            //       icon: "svg-wind-site",
-            //       path: "/health/nxfx/qxpclfx",
-            //     },
-
-            //     {
-            //       text: "单机饱和度",
-            //       icon: "svg-wind-site",
-            //       path: "/health/nxfx/wtSaturability",
-            //     },
-            //   ],
-            // },
+            {
+              text: "能效分析",
+              icon: "svg-能效分析",
+              path: "/health/nxfx/powerCurve",
+              children: [
+                {
+                  text: "功率曲线拟合",
+                  icon: "svg-wind-site",
+                  path: "/health/nxfx/powerCurve",
+                },
+                // {
+                //   text: "偏航对风分析",
+                //   icon: "svg-wind-site",
+                //   path: "/health/nxfx/phdffx",
+                // },
+                // {
+                //   text: "切入切出分析",
+                //   icon: "svg-wind-site",
+                //   path: "/health/nxfx/cutAnalyse",
+                // },
+                {
+                  text: "曲线偏差率分析",
+                  icon: "svg-wind-site",
+                  path: "/health/nxfx/qxpclfx",
+                },
+                {
+                  text: "单机饱和度",
+                  icon: "svg-wind-site",
+                  path: "/health/nxfx/wtSaturability",
+                },
+                {
+                  text: "部件温度分析",
+                  icon: "svg-wind-site",
+                  path: "/health/nxfx/temperatureAnalysis",
+                },
+              ],
+            },
             // {
             //   text: "可靠性分析",
             //   icon: "svg-可靠性分析",

src/views/nxfx/qxpclfx.vue

@@ -34,34 +34,21 @@
             </el-select>
           </div>
         </div>
-        <div class="query-item" v-if="shows == true">
-          <div class="lable">年月：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="date"
-              type="month"
-              placeholder="选择年月"
-              popper-class="date-select"
-              value-format="YYYY-MM"
-            >
-            </el-date-picker>
-          </div>
-        </div>
-        <div class="query-item" v-else>
+        <div class="query-item">
           <div class="lable">日期：</div>
           <div class="search-input">
             <el-date-picker
-              v-model="date2"
-              type="date"
+              v-model="date"
+              :type="cur ? 'date' : 'month'"
               placeholder="选择日期"
               popper-class="date-select"
-              value-format="YYYY-MM-DD"
+              :value-format="`YYYY-MM${cur ? '-DD' : ''}`"
             >
             </el-date-picker>
           </div>
         </div>
         <div class="query-actions">
-          <button class="btn green" @click="handleSubmit">查询</button>
+          <button class="btn green" @click="getTable">查询</button>
         </div>
       </div>
     </div>
@@ -91,68 +78,60 @@ export default {
       cur: 0,
       optionData: ["月曲线偏差率排行榜", "日曲线偏差率排行榜"],
       ChangZhan: [],
-      value1: "CL_FDC",
+      value1: "",
       date: "",
-      date2: "",
-      shows: true,
       showTitle: "月曲线偏差率排行榜",
       tableLoading: true,
       tableData: {
         column: [
           {
             name: "风机",
-            field: "fj",
+            field: "windturbineId",
             is_num: false,
             is_light: false,
             sortable: thermometerVue,
           },
           {
             name: "实际 / 保证（%）",
-            field: "sjbz",
+            field: "deviationRate2",
             is_num: false,
             is_light: false,
             sortable: true,
-            id: "id",
           },
           {
             name: "实际 / 最优（%）",
-            field: "sjzy",
+            field: "deviationRate1",
             is_num: false,
             is_light: false,
             sortable: true,
-            id: "id",
           },
           {
             name: "最优 / 保证（%）",
-            field: "zybz",
+            field: "deviationRate3",
             is_num: false,
             is_light: false,
             sortable: true,
-            id: "id",
           },
           {
             name: "环比",
-            field: "hb",
+            field: "monthDeviationRate",
             is_num: false,
             is_light: false,
             sortable: true,
-            id: "id",
           },
           {
             name: "同比",
-            field: "tb",
+            field: "yearDeviationRate",
             is_num: false,
             is_light: false,
             sortable: true,
-            id: "id",
           },
           {
             name: "比标杆风机",
-            field: "bbgfj",
+            field: "standardDeviationRate",
             is_num: false,
             is_light: false,
             sortable: true,
-            id: "id",
           },
         ],
         data: [],
@@ -162,107 +141,58 @@ export default {
   },
   created() {
     this.ChangZhanVal();
-    this.date = this.getDate(1);
-   
-    this.getTable(this.date);
-    // this.getTable(this.date1);
+    this.date = new Date().formatDate("yyyy-MM-dd");
   },
   methods: {
     // 获取表格数据
-    getTable(date) {
-      // let that = this;
+    getTable() {
       this.tableLoading = true;
 
-      api
-        .leaderboardCurvefittingmainList({
-          isAsc: "asc",
-          wpId: this.value1,
-          recorddate: date,
-          pageNum: 1,
-          pageSize: 1000,
-        })
-        .then((res) => {
-          this.tableLoading = false;
-          if (res.code === 200) {
-            // that.tableData.data = res.data
-            var data = [];
-            res.data.forEach((item, index) => {
-              data[index] = {
-                fj: item.windturbineid,
-                sjbz: item.deviationrate2,
-                sjzy: item.deviationrate1,
-                zybz: item.deviationrate3,
-                hb: item.monthdeviationrate,
-                tb: item.yeardeviationrate,
-                bbgfj: item.standarddeviationrate,
-              };
-            });
-            this.tableData.data = data;
-          }
-        });
+      const url = this.cur
+        ? "getCurvefittingmainList"
+        : "getCurvefittingmonthmainList";
+
+      const param = {
+        isAsc: "asc",
+        wpId: this.value1,
+        pageNum: 1,
+        pageSize: 1000,
+      };
+
+      if (this.cur) {
+        param.recorddate = this.date;
+      } else {
+        param.year = parseInt(this.date?.split("-")[0]);
+        param.month = parseInt(this.date?.split("-")[1]);
+      }
+
+      api[url](param).then((res) => {
+        this.tableLoading = false;
+        if (res.code === 200) {
+          this.tableData.data = res.data || [];
+        }
+      });
     },
     //   tab
     handleOpen(vl, index) {
-      console.log(index);
-      this.$nextTick(() => {
-        this.cur = index;
-        this.showTitle = vl;
-        if (index == 0) {
-          this.getDate(1);
-          this.getTable(this.date);
-          this.shows = true;
-        } else {
-          this.getDate(2);
-           this.date = this.getDate(2);
-          this.getTable(this.date);
-          this.shows = false;
-        }
-      });
+      this.cur = index;
+      this.showTitle = vl;
+      this.date = new Date().formatDate(`yyyy-MM${index ? "-dd" : ""}`);
+      this.getTable();
     },
     // 场站
     ChangZhanVal() {
-      api1.benchmarkingWplist({}).then((res) => {
-        this.ChangZhan = res.data;
-        this.value1 = res.data[0].id;
-      });
-
-      // var that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/wplist",
-      //   success(res) {
-      //     that.ChangZhan = res.data;
-      //     that.value1 = res.data[0].id;
-      //   }
-      // });
-    },
-    // 查询
-    handleSubmit() {
-      if (this.shows == true) {
-        // alert(this.date);
-        this.getTable(this.date);
-      } else {
-        // alert(this.date2);
-        this.getTable(this.date2);
-      }
-    },
-    // 获取日期
-    getDate(vl) {
-      //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
-      var date = new Date();
-      var year = date.getFullYear(),
-        month = date.getMonth(),
-        day = date.getDate() - 1;
-      month >= 1 && month <= 9 ? (month = "0" + month) : "";
-      day >= 0 && day <= 9 ? (day = "0" + day) : "";
-      var begin = year + "-" + month;
-      var end = year + "-" + month + "-" + day;
-      if (vl == 1) {
-        return begin;
-      } else if (vl == 2) {
-        return end;
-      }
+      api1
+        .getWpList({
+          type: "-1",
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            this.ChangZhan = res.data.data;
+            this.value1 = res.data.data[0].id;
+            this.getTable();
+          }
+        });
     },
   },
 };

src/views/temperatureAnalysis/index.vue

@@ -0,0 +1,242 @@
+<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"
+              placeholder="请选择"
+              popper-class="select"
+              @change="getWt"
+            >
+              <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"
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in wtArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.nemCode"
+              />
+            </el-select>
+          </div>
+        </div> -->
+        <div class="query-item">
+          <div class="lable">部件类型：</div>
+          <div class="search-input">
+            <el-select v-model="partId" placeholder="Select" size="small">
+              <el-option
+                v-for="item in partArray"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </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="getTableData">搜索</button>
+      </div>
+    </div>
+    <el-table
+      class="custom-table"
+      :data="tableData"
+      style="width: 100%"
+      height="89vh"
+    >
+      <el-table-column type="index" label="序号" :width="75" align="center" />
+      <el-table-column
+        :label="pItem.label"
+        v-for="(pItem, pIndex) in tableColumnList"
+        :key="pItem.id"
+        align="center"
+        show-overflow-tooltip
+        :sortable="!pItem.children?.length"
+        :sort-by="
+          () => {
+            tableSort(pIndex);
+          }
+        "
+      >
+        <template v-if="pItem.children?.length">
+          <el-table-column
+            :label="cItem.label"
+            v-for="cItem in pItem.children"
+            :key="cItem.id"
+            align="center"
+            :sortable="!cItem.children?.length"
+            :sort-by="
+              () => {
+                tableSort(cItem.index);
+              }
+            "
+          >
+            <template #default="scope">
+              <span>{{ scope.row[cItem.index] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+        <template #default="scope" v-if="!pItem.children?.length">
+          <span>{{ scope.row[pIndex] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import api from "@api/economic/index.js";
+import axios from "axios";
+export default {
+  data() {
+    return {
+      wpId: "",
+      wtId: "",
+      wpArray: [],
+      wtArray: [],
+      partId: "fdj",
+      partArray: [
+        { label: "发电机", value: "fdj" },
+        { label: "齿轮箱", value: "clx" },
+        { label: "变桨", value: "bj" },
+        { label: "主控", value: "zk" },
+      ],
+      tableData: [],
+      recordDate: new Date().formatDate("yyyy-MM-dd"),
+      tableColumnList: [],
+    };
+  },
+
+  created() {
+    this.getWp();
+  },
+
+  methods: {
+    // 获取风场
+    getWp() {
+      api
+        .getWpList({
+          type: "-1",
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            this.wpArray = res.data.data;
+            this.wpId = res.data.data?.[0]?.id;
+            this.getWt();
+          }
+        });
+    },
+
+    // 获取风机
+    getWt() {
+      api
+        .getWtList({
+          wpId: this.wpId,
+        })
+        .then((res) => {
+          if (res.code === 200) {
+            this.wtArray = res.data;
+            this.wtId = res.data?.[0]?.id;
+            this.getTableData();
+          }
+        });
+    },
+
+    // 获取表格数据
+    getTableData() {
+      this.BASE.showLoading();
+      axios({
+        methods: "get",
+        baseURL: process.env.VUE_APP_NEW_WISDOM,
+        url: `/health/getParttemperaturesubListByWpId?wpId=${this.wpId}&recorddate=${this.recordDate}&partId=${this.partId}`,
+      }).then((res) => {
+        const title1 = res.data?.data?.title1 || [];
+        const title2 = res.data?.data?.title2 || [];
+        const excludeItem = /^风机编号$|^风机编码$/;
+
+        let tableColumnList = [];
+
+        title1?.forEach((ele, index) => {
+          const findRes = tableColumnList.find((soleEle) => {
+            return soleEle.label === ele;
+          });
+          if (!findRes) {
+            let children = [];
+            if (!excludeItem.test(ele)) {
+              children.push({ id: this.getId(), label: title2[index], index });
+            }
+            tableColumnList.push({
+              id: this.getId(),
+              label: ele,
+              children,
+              index,
+            });
+          } else {
+            findRes.children.push({
+              id: this.getId(),
+              label: title2[index],
+              index,
+            });
+          }
+        });
+
+        this.tableData = res.data?.data?.list || [];
+        this.tableColumnList = tableColumnList;
+        this.BASE.closeLoading();
+      });
+    },
+
+    // 生成随机 ID
+    getId() {
+      return String(
+        new Date().getTime() + this.BASE.randomNum(1000000000, 5000000000000)
+      );
+    },
+
+    tableSort(dataIndex) {
+      return this.tableData.sort((a, b) => {
+        const num1 = parseFloat(String(a[dataIndex]).replace(/^#/, ""));
+        const num2 = parseFloat(String(b[dataIndex]).replace(/^#/, ""));
+        return num1 - num2;
+      });
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.tableBox {
+  width: 100%;
+  overflow: auto;
+}
+</style>
+  

src/views/windAnalysis/phdffx.vue

@@ -36,7 +36,7 @@
               <el-option
                 v-for="item in wtList"
                 :key="item.id"
-                :label="item.name"
+                :label="item.nemCode"
                 :value="item.id"
               ></el-option>
             </el-select>
@@ -141,42 +141,36 @@ export default {
   methods: {
     // 场站
     getStations() {
-      api1.benchmarkingWplist({}).then((res) => {
-        this.wpList = res.data.data;
-      });
-
-      // const res = await this.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/wplist",
-      // });
-      // this.wpList = res.data.data;
-      // this.wpId = res.data.data[0].id;
+      api1
+        .getWpList({
+          type: "-1",
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            this.wpList = res.data.data;
+            this.wpId = res.data.data[0].id;
+            this.getTurbines();
+          }
+        });
     },
     getTurbines() {
       api1
-        .powercompareWindturbineAjax({
+        .getWtList({
           wpId: this.wpId,
         })
         .then((res) => {
-          if(res.data)
-          this.wtList = res.data;
-          this.wtId = res.data[0].id;
+          if (res.code === 200) {
+            this.wtList = res.data;
+            this.wtId = res.data[0].id;
+          }
         });
-      // const res = await this.API.requestData({
-      //   method: "GET",
-      //   subUrl: "powercompare/windturbineAjax",
-      //   data: { wpId: this.wpId },
-      // });
-      // this.wtList = res.data.data;
-      // this.wtId = res.data.data[0].id;
     },
 
     getCharts() {
       this.$nextTick(() => {
         this.getChart1();
-        this.getChart2();
-        this.getChart3();
+        // this.getChart2();
+        // this.getChart3();
       });
     },
 
@@ -189,7 +183,6 @@ export default {
           type: 2,
         })
         .then((res) => {
-
           if (res && res.data && res.data.data) {
             const xData = [];
             const lData = [];
@@ -646,112 +639,113 @@ export default {
       // }
     },
     getChart3() {
-      api.yawGetTotalRanges({
-            wtId: this.wtId,
+      api
+        .yawGetTotalRanges({
+          wtId: this.wtId,
           beginDate: this.startDate,
           endDate: this.endDate,
           type: 1,
-      }).then((res) => {
+        })
+        .then((res) => {
           if (res && res.data && res.data.data) {
-        const xData = [];
-        const lData = [];
-        const dataMap = res.data.data;
-        for (let key in dataMap) {
-          let tmpKey = key.replace(/r/, "");
-          tmpKey = tmpKey.replace(/_/, "-");
-          if (tmpKey < 100) {
-            xData.push(tmpKey);
-            lData.push(dataMap[key]);
-          }
-        }
-        this.line3Data = lData;
-        let option = {
-          color: ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"],
-          tooltip: {
-            trigger: "axis",
-            backgroundColor: "rgba(0,0,0,0.4)",
-            borderColor: partten.getColor("gray"),
-            textStyle: {
-              color: "#fff",
-              fontSize: util.vh(16),
-            },
-          },
-          legend: {
-            show: false,
-            data: ["偏航次数"],
-            right: 56,
-            icon: "circle",
-            itemWidth: 6,
-            inactiveColor: "#606769",
-            textStyle: {
-              color: partten.getColor("grayl"),
-              fontSize: 12,
-            },
-          },
-          grid: {
-            top: util.vh(40),
-            left: util.vh(60),
-            right: util.vh(130),
-            bottom: util.vh(24),
-          },
-          xAxis: [
-            {
-              name: "对风偏差（度）",
-              type: "category",
-              boundaryGap: false,
-              axisLabel: {
-                formatter: "{value}",
-                fontSize: util.vh(14),
+            const xData = [];
+            const lData = [];
+            const dataMap = res.data.data;
+            for (let key in dataMap) {
+              let tmpKey = key.replace(/r/, "");
+              tmpKey = tmpKey.replace(/_/, "-");
+              if (tmpKey < 100) {
+                xData.push(tmpKey);
+                lData.push(dataMap[key]);
+              }
+            }
+            this.line3Data = lData;
+            let option = {
+              color: ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"],
+              tooltip: {
+                trigger: "axis",
+                backgroundColor: "rgba(0,0,0,0.4)",
+                borderColor: partten.getColor("gray"),
                 textStyle: {
-                  color: partten.getColor("gray"),
+                  color: "#fff",
+                  fontSize: util.vh(16),
                 },
               },
-              data: xData,
-            },
-          ],
-          yAxis: [
-            {
-              type: "value",
-              name: "数量",
-              axisLabel: {
-                formatter: "{value}",
-                fontSize: util.vh(14),
-              },
-              splitLine: {
-                lineStyle: {
-                  color: partten.getColor("gray") + 55,
-                  type: "dashed",
+              legend: {
+                show: false,
+                data: ["偏航次数"],
+                right: 56,
+                icon: "circle",
+                itemWidth: 6,
+                inactiveColor: "#606769",
+                textStyle: {
+                  color: partten.getColor("grayl"),
+                  fontSize: 12,
                 },
               },
-            },
-          ],
-          series: [
-            {
-              name: "数量",
-              type: "line",
-              smooth: true,
-              zlevel: 0,
-              lineStyle: {
-                normal: {
-                  color: "#05bb4c",
-                  width: 1,
-                },
+              grid: {
+                top: util.vh(40),
+                left: util.vh(60),
+                right: util.vh(130),
+                bottom: util.vh(24),
               },
-              yAxisIndex: 0,
-              data: lData,
-            },
-          ],
-        };
-        const chart = echarts.init(document.getElementById("linechart3"));
-        chart.clear();
-        chart.setOption(option);
-        this.resize = function () {
-          chart.resize();
-        };
-        window.addEventListener("resize", this.resize);
-      }
-      });
-
+              xAxis: [
+                {
+                  name: "对风偏差（度）",
+                  type: "category",
+                  boundaryGap: false,
+                  axisLabel: {
+                    formatter: "{value}",
+                    fontSize: util.vh(14),
+                    textStyle: {
+                      color: partten.getColor("gray"),
+                    },
+                  },
+                  data: xData,
+                },
+              ],
+              yAxis: [
+                {
+                  type: "value",
+                  name: "数量",
+                  axisLabel: {
+                    formatter: "{value}",
+                    fontSize: util.vh(14),
+                  },
+                  splitLine: {
+                    lineStyle: {
+                      color: partten.getColor("gray") + 55,
+                      type: "dashed",
+                    },
+                  },
+                },
+              ],
+              series: [
+                {
+                  name: "数量",
+                  type: "line",
+                  smooth: true,
+                  zlevel: 0,
+                  lineStyle: {
+                    normal: {
+                      color: "#05bb4c",
+                      width: 1,
+                    },
+                  },
+                  yAxisIndex: 0,
+                  data: lData,
+                },
+              ],
+            };
+            const chart = echarts.init(document.getElementById("linechart3"));
+            chart.clear();
+            chart.setOption(option);
+            this.resize = function () {
+              chart.resize();
+            };
+            window.addEventListener("resize", this.resize);
+          }
+        });
 
       // const res = await this.API.requestData({
       //   method: "POST",
@@ -862,114 +856,117 @@ export default {
       //   window.addEventListener("resize", this.resize);
       // }
     },
-   showDetail(type, value) {
+    showDetail(type, value) {
       this.dialogShow = true;
 
-api.yawGetRanges({
-        wtId: this.wtId,
+      api
+        .yawGetRanges({
+          wtId: this.wtId,
           beginDate: this.startDate,
           endDate: this.endDate,
           type: type,
           value: value,
-      }).then((res) => {
-        if (res && res.data && res.data.data) {
-        const xData = [];
-        const lData = [];
-        const dataMap = res.data.data;
-        for (let key in dataMap) {
-          let tmpKey = key.replace(/r/, "");
-          tmpKey = tmpKey.replace(/_/, "-");
-          if (tmpKey < 100) {
-            xData.push(tmpKey);
-            lData.push(dataMap[key]);
-          }
-        }
-        let option = {
-          color: ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"],
-          tooltip: {
-            trigger: "axis",
-            backgroundColor: "rgba(0,0,0,0.4)",
-            borderColor: partten.getColor("gray"),
-            textStyle: {
-              color: "#fff",
-              fontSize: util.vh(16),
-            },
-          },
-          legend: {
-            show: false,
-            data: ["偏航次数"],
-            right: 56,
-            icon: "circle",
-            itemWidth: 6,
-            inactiveColor: "#606769",
-            textStyle: {
-              color: partten.getColor("grayl"),
-              fontSize: 12,
-            },
-          },
-          grid: {
-            top: util.vh(40),
-            left: util.vh(60),
-            right: util.vh(130),
-            bottom: util.vh(24),
-          },
-          xAxis: [
-            {
-              name: "对风偏差（度）",
-              type: "category",
-              boundaryGap: false,
-              axisLabel: {
-                formatter: "{value}",
-                fontSize: util.vh(14),
+        })
+        .then((res) => {
+          if (res && res.data && res.data.data) {
+            const xData = [];
+            const lData = [];
+            const dataMap = res.data.data;
+            for (let key in dataMap) {
+              let tmpKey = key.replace(/r/, "");
+              tmpKey = tmpKey.replace(/_/, "-");
+              if (tmpKey < 100) {
+                xData.push(tmpKey);
+                lData.push(dataMap[key]);
+              }
+            }
+            let option = {
+              color: ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"],
+              tooltip: {
+                trigger: "axis",
+                backgroundColor: "rgba(0,0,0,0.4)",
+                borderColor: partten.getColor("gray"),
                 textStyle: {
-                  color: partten.getColor("gray"),
+                  color: "#fff",
+                  fontSize: util.vh(16),
                 },
               },
-              data: xData,
-            },
-          ],
-          yAxis: [
-            {
-              type: "value",
-              name: "数量",
-              axisLabel: {
-                formatter: "{value}",
-                fontSize: util.vh(14),
-              },
-              splitLine: {
-                lineStyle: {
-                  color: partten.getColor("gray") + 55,
-                  type: "dashed",
+              legend: {
+                show: false,
+                data: ["偏航次数"],
+                right: 56,
+                icon: "circle",
+                itemWidth: 6,
+                inactiveColor: "#606769",
+                textStyle: {
+                  color: partten.getColor("grayl"),
+                  fontSize: 12,
                 },
               },
-            },
-          ],
-          series: [
-            {
-              name: "数量",
-              type: "line",
-              smooth: true,
-              zlevel: 0,
-              lineStyle: {
-                normal: {
-                  color: "#05bb4c",
-                  width: 1,
-                },
+              grid: {
+                top: util.vh(40),
+                left: util.vh(60),
+                right: util.vh(130),
+                bottom: util.vh(24),
               },
-              yAxisIndex: 0,
-              data: lData,
-            },
-          ],
-        };
-        const chart = echarts.init(document.getElementById("linechartDialog"));
-        chart.clear();
-        chart.setOption(option);
-        this.resize = function () {
-          chart.resize();
-        };
-      }
-      });
-
+              xAxis: [
+                {
+                  name: "对风偏差（度）",
+                  type: "category",
+                  boundaryGap: false,
+                  axisLabel: {
+                    formatter: "{value}",
+                    fontSize: util.vh(14),
+                    textStyle: {
+                      color: partten.getColor("gray"),
+                    },
+                  },
+                  data: xData,
+                },
+              ],
+              yAxis: [
+                {
+                  type: "value",
+                  name: "数量",
+                  axisLabel: {
+                    formatter: "{value}",
+                    fontSize: util.vh(14),
+                  },
+                  splitLine: {
+                    lineStyle: {
+                      color: partten.getColor("gray") + 55,
+                      type: "dashed",
+                    },
+                  },
+                },
+              ],
+              series: [
+                {
+                  name: "数量",
+                  type: "line",
+                  smooth: true,
+                  zlevel: 0,
+                  lineStyle: {
+                    normal: {
+                      color: "#05bb4c",
+                      width: 1,
+                    },
+                  },
+                  yAxisIndex: 0,
+                  data: lData,
+                },
+              ],
+            };
+            const chart = echarts.init(
+              document.getElementById("linechartDialog")
+            );
+            chart.clear();
+            chart.setOption(option);
+            this.resize = function () {
+              chart.resize();
+            };
+          }
+        });
 
       // const res = await this.API.requestData({
       //   method: "POST",

src/views/wtSaturability/tab1.vue

@@ -38,7 +38,7 @@
                 v-for="item in wtArray"
                 :key="item.id"
                 :value="item.id"
-                :label="item.name"
+                :label="item.nemCode"
               />
             </el-select>
           </div>
@@ -87,7 +87,7 @@ export default {
         column: [
           {
             name: "风机",
-            field: "windturbineid",
+            field: "windturbineId",
             is_num: false,
             is_light: false,
             sortable: true,
@@ -101,14 +101,14 @@ export default {
           },
           {
             name: "实际拟合功率(kW)",
-            field: "actualpower",
+            field: "actualPower",
             is_num: false,
             is_light: false,
             sortable: true,
           },
           {
             name: "最优拟合功率(kW)",
-            field: "optimalpower",
+            field: "optimalPower",
             is_num: false,
             is_light: false,
             sortable: true,
@@ -132,93 +132,59 @@ export default {
   methods: {
     // 获取风场
     getWp(reGetWp) {
-      api1.benchmarkingWplist({}).then((res) => {
-        this.wpArray = res.data;
-        this.wpId = res.data[0].id;
-        this.getWt(this.wpId, reGetWp);
-      });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   subUrl: "powercompare/windfarmAjax",
-      //   success (res) {
-      //     that.wpArray = res.data;
-      //     that.wpId = res.data[0].id;
-      //     that.getWt(that.wpId, reGetWp);
-      //   }
-      // });
+      api1
+        .getWpList({
+          type: "-1",
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            this.wpArray = res.data.data;
+            this.wpId = res.data.data[0].id;
+            this.getWt(this.wpId, reGetWp);
+          }
+        });
     },
 
     // 获取风机
     getWt(wpid, reGetWp) {
-      if (this.wpId) {
+      if (wpid) {
         api1
-          .powercompareWindturbineAjax({
+          .getWtList({
             wpId: wpid,
           })
           .then((res) => {
-            this.wtArray = res.data;
-            this.wtId = res.data[0].id;
-            if (!reGetWp) {
-              this.getTabData();
+            if (res.code === 200) {
+              this.wtArray = res.data;
+              this.wtId = res.data[0].id;
+              if (!reGetWp) {
+                this.getTabData();
+                this.getChartData();
+              }
             }
           });
       }
-      // let that = this;
-
-      //   that.API.requestData({
-      //     method: "GET",
-      //     baseURL: "http://10.155.32.4:9001",
-      //     subUrl: "benchmarking/wtList",
-      //     data: {
-      //       wpid,
-      //     },
-      //     success(res) {
-      //       that.wtArray = res.data;
-      //       that.wtId = res.data[0].id;
-      //       if (!reGetWp) {
-      //         that.getTabData();
-      //       }
-      //     },
-      //   });
     },
 
     getTabData() {
-
-      api.powersaturationPowersaturationamonutlist({
+      api
+        .powersaturationPowersaturationamonutlist({
           wtId: this.wtId,
-           pageNum: 1,
-          pageSize:5,
-      }).then((res) => {
-        if(res.data)
-        this.tableData.data = res.data.list;
+          pageNum: 1,
+          pageSize: 5,
+        })
+        .then((res) => {
+          if (res.data) this.tableData.data = res.data.records;
           this.getChartData();
-      });
-
-
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "POST",
-      //   subUrl: "powersaturation/powersaturationamonutlist",
-      //   data: {
-      //     wtId: that.wtId,
-      //   },
-      //   success(res) {
-      //     that.tableData.data = res.data.list;
-      //     that.getChartData();
-      //   },
-      // });
+        });
     },
 
     // 获取图表数据
     getChartData() {
-      api.powersaturationPowersaturationamonutchart({
-         wtId: this.wtId,
-      }).then((res) => {
-          if(res.data)
-            console.log("chartData1:", res);
+      api
+        .powersaturationPowersaturationamonutchart({
+          wtId: this.wtId,
+        })
+        .then((res) => {
           const keyArray = [
             //   {
             //   key: "value1",
@@ -264,14 +230,7 @@ export default {
           ];
 
           keyArray.forEach((keyEle, keyIndex) => {
-            console.log("keyele:", keyEle, "keyindex:", keyIndex);
-            console.log("resdata:", res.data);
             res?.data?.forEach((ele) => {
-              console.log("ele:", ele);
-              console.log(
-                " chartData[keyIndex].value:",
-                chartData[keyIndex].value
-              );
               chartData[keyIndex].value.push({
                 text: "",
                 value: ele[keyEle.key],
@@ -280,8 +239,7 @@ export default {
           });
 
           this.chartData = chartData;
-      });
-
+        });
 
       // let that = this;
       // that.API.requestData({
@@ -291,7 +249,6 @@ export default {
       //     wtId: that.wtId,
       //   },
       //   success(res) {
-      //     console.log("chartData1:", res);
       //     const keyArray = [
       //       //   {
       //       //   key: "value1",
@@ -337,14 +294,7 @@ export default {
       //     ];
 
       //     keyArray.forEach((keyEle, keyIndex) => {
-      //       console.log("keyele:", keyEle, "keyindex:", keyIndex);
-      //       console.log("resdata:", res.data);
       //       res.data.forEach((ele) => {
-      //         console.log("ele:", ele);
-      //         console.log(
-      //           " chartData[keyIndex].value:",
-      //           chartData[keyIndex].value
-      //         );
       //         chartData[keyIndex].value.push({
       //           text: "",
       //           value: ele[keyEle.key],

src/views/wtSaturability/tab2.vue

@@ -38,7 +38,7 @@
                 v-for="item in wtArray"
                 :key="item.id"
                 :value="item.id"
-                :label="item.name"
+                :label="item.nemCode"
               />
             </el-select>
           </div>
@@ -62,9 +62,9 @@
       </div>
     </div>
     <div
-     class="df-table"
-       style="width: 100%; margin-bottom: 10px; overflow-y: auto"
-     >
+      class="df-table"
+      style="width: 100%; margin-bottom: 10px; overflow-y: auto"
+    >
       <ComTable height="35vh" :data="tableData"></ComTable>
     </div>
     <Mlc
@@ -133,7 +133,6 @@ export default {
 
   // 数据
   data() {
-    const that = this;
     return {
       isAsc: "asc",
       wpArray: [],
@@ -149,7 +148,7 @@ export default {
         column: [
           {
             name: "风机",
-            field: "windturbineid",
+            field: "windturbineId",
             is_num: false,
             is_light: false,
             sortable: true,
@@ -163,14 +162,14 @@ export default {
           },
           {
             name: "实际拟合功率(kW)",
-            field: "actualpower",
+            field: "actualPower",
             is_num: false,
             is_light: false,
             sortable: true,
           },
           {
             name: "最优拟合功率(kW)",
-            field: "optimalpower",
+            field: "optimalPower",
             is_num: false,
             is_light: false,
             sortable: true,
@@ -209,58 +208,37 @@ export default {
   methods: {
     // 获取风场
     getWp(reGetWp) {
-      api1.benchmarkingWplist({}).then((res) => {
-        this.wpArray = res.data;
-        this.wpId = res.data[0].id;
-        this.getWt(this.wpId, reGetWp);
-      });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   subUrl: "powercompare/windfarmAjax",
-      //   success (res) {
-      //     that.wpArray = res.data;
-      //     that.wpId = res.data[0].id;
-      //     that.getWt(that.wpId, reGetWp);
-      //   }
-      // });
+      api1
+        .getWpList({
+          type: "-1",
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            this.wpArray = res.data.data;
+            this.wpId = res.data.data[0].id;
+            this.getWt(this.wpId, reGetWp);
+          }
+        });
     },
 
     // 获取风机
     getWt(wpid, reGetWp) {
-      if (this.wpId) {
+      if (wpid) {
         api1
-          .powercompareWindturbineAjax({
+          .getWtList({
             wpId: wpid,
           })
           .then((res) => {
-            this.wtArray = res.data;
-            this.wtId = res.data[0].id;
-            if (!reGetWp) {
-              this.getTabData();
+            if (res.code === 200) {
+              this.wtArray = res.data;
+              this.wtId = res.data[0].id;
+              if (!reGetWp) {
+                this.getTabData();
+                this.getChartData();
+              }
             }
           });
       }
-
-      // let that = this;
-      // if (this.wpId) {
-      //   that.API.requestData({
-      //     method: "GET",
-      //     baseURL: "http://10.155.32.4:9001",
-      //     subUrl: "benchmarking/wtList",
-      //     data: {
-      //       wpid
-      //     },
-      //     success (res) {
-      //       that.wtArray = res.data;
-      //       that.wtId = res.data[0].id;
-      //       if (!reGetWp) {
-      //         that.getTabData();
-      //       }
-      //     }
-      //   });
-      // }
     },
 
     getTabData() {
@@ -273,24 +251,9 @@ export default {
           pageSize: 5,
         })
         .then((res) => {
-          if (res.data) this.tableData.data = res.data.list;
+          if (res.data) this.tableData.data = res.data.records;
           this.getChartData();
         });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "POST",
-      //   subUrl: "powersaturation/powersaturationmonthlist",
-      //   data: {
-      //     wtId: that.wtId,
-      //     year: new Date(that.recorddate).getFullYear(),
-      //     month: new Date(that.recorddate).getMonth() + 1,
-      //   },
-      //   success(res) {
-      //     that.tableData.data = res.data.list;
-      //     that.getChartData();
-      //   },
-      // });
     },
 
     // 获取图表数据
@@ -358,72 +321,6 @@ export default {
             this.chartData = chartData;
           }
         });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "POST",
-      //   subUrl: "powersaturation/powersaturationmonthchart",
-      //   data: {
-      //     wtId: that.wtId,
-      //     year: new Date(that.recorddate).getFullYear(),
-      //     month: new Date(that.recorddate).getMonth() + 1,
-      //   },
-      //   success(res) {
-      //     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],
-      //         });
-      //       });
-      //     });
-
-      //     that.chartData = chartData;
-      //   },
-      // });
     },
 
     // 编辑

src/views/wtSaturability/tab3.vue

@@ -38,7 +38,7 @@
                 v-for="item in wtArray"
                 :key="item.id"
                 :value="item.id"
-                :label="item.name"
+                :label="item.nemCode"
               />
             </el-select>
           </div>
@@ -146,7 +146,7 @@ export default {
         column: [
           {
             name: "风机",
-            field: "windturbineid",
+            field: "windturbineId",
             is_num: false,
             is_light: false,
             sortable: true,
@@ -160,14 +160,14 @@ export default {
           },
           {
             name: "实际拟合功率(kW)",
-            field: "actualpower",
+            field: "actualPower",
             is_num: false,
             is_light: false,
             sortable: true,
           },
           {
             name: "最优拟合功率(kW)",
-            field: "optimalpower",
+            field: "optimalPower",
             is_num: false,
             is_light: false,
             sortable: true,
@@ -206,58 +206,37 @@ export default {
   methods: {
     // 获取风场
     getWp(reGetWp) {
-      api1.benchmarkingWplist({}).then((res) => {
-        this.wpArray = res.data;
-        this.wpId = res.data[0].id;
-        this.getWt(this.wpId, reGetWp);
-      });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   subUrl: "powercompare/windfarmAjax",
-      //   success (res) {
-      //     that.wpArray = res.data;
-      //     that.wpId = res.data[0].id;
-      //     that.getWt(that.wpId, reGetWp);
-      //   }
-      // });
+      api1
+        .getWpList({
+          type: "-1",
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            this.wpArray = res.data.data;
+            this.wpId = res.data.data[0].id;
+            this.getWt(this.wpId, reGetWp);
+          }
+        });
     },
 
     // 获取风机
     getWt(wpid, reGetWp) {
-      if (this.wpId) {
+      if (wpid) {
         api1
-          .powercompareWindturbineAjax({
+          .getWtList({
             wpId: wpid,
           })
           .then((res) => {
-            this.wtArray = res.data;
-            this.wtId = res.data[0].id;
-            if (!reGetWp) {
-              this.getTabData();
+            if (res.code === 200) {
+              this.wtArray = res.data;
+              this.wtId = res.data[0].id;
+              if (!reGetWp) {
+                this.getTabData();
+                this.getChartData();
+              }
             }
           });
       }
-
-      // let that = this;
-      // if (that.wpId) {
-      //   that.API.requestData({
-      //     method: "GET",
-      //     baseURL: "http://10.155.32.4:9001",
-      //     subUrl: "benchmarking/wtList",
-      //     data: {
-      //       wpid
-      //     },
-      //     success (res) {
-      //       that.wtArray = res.data;
-      //       that.wtId = res.data[0].id;
-      //       if (!reGetWp) {
-      //         that.getTabData();
-      //       }
-      //     }
-      //   });
-      // }
     },
 
     getTabData() {
@@ -265,27 +244,13 @@ export default {
         .powersaturationPowersaturationlist({
           wtId: this.wtId,
           recorddate: this.recorddate,
-             pageNum: 1,
-          pageSize:5,
+          pageNum: 1,
+          pageSize: 5,
         })
         .then((res) => {
-          if (res.data) this.tableData.data = res.data.list;
+          if (res.data) this.tableData.data = res.data.records;
           this.getChartData();
         });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "POST",
-      //   subUrl: "powersaturation/powersaturationlist",
-      //   data: {
-      //     wtId: that.wtId,
-      //     recorddate: that.recorddate
-      //   },
-      //   success (res) {
-      //     that.tableData.data = res.data.list;
-      //     that.getChartData();
-      //   }
-      // });
     },
 
     // 获取图表数据
@@ -352,66 +317,6 @@ export default {
             this.chartData = chartData;
           }
         });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "POST",
-      //   subUrl: "powersaturation/powersaturationchart",
-      //   data: {
-      //     wtId: that.wtId,
-      //     recorddate: that.recorddate
-      //   },
-      //   success (res) {
-
-      //     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]
-      //         });
-      //       });
-      //     });
-
-      //     that.chartData = chartData;
-      //   }
-      // });
     },
 
     // 编辑