update

src/api/wisdomOverhaul/energy/index.js

@@ -0,0 +1,32 @@
+import request from "../../../tools/request";
+
+
+const yawGetPassRate = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        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,
+        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,
+        url: `yaw/getRanges?wtId=${data.wtId}$beginDate=${data.beginDate}$endDate=${data.endDate}$type=${data.type}$value=${data.value}`,
+        method: "get",
+    });
+};
+
+
+
+export default {
+    yawGetPassRate,
+    yawGetTotalRanges,
+    yawGetRanges
+}

src/api/wisdomOverhaul/fault/index.js

@@ -25,8 +25,8 @@ const stopanalysisStopAnalysisTree = (data) => {
 const eventGetShutdownevent = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `/event/getShutdownevent?pageNum=${data.tablepar.pageNum}&pageSize=${data.tablepar.pageSize}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpId=${data.wpId}`,
-        method: "get",
+        url: `/fault/getShutdownevent?pageNum=${data.tablepar.pageNum}&pageSize=${data.tablepar.pageSize}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpId=${data.wpId}&type=${data.type}&wtId=${data.wtId}`,
+        method: "post",
     });
 };
 

src/api/wisdomOverhaul/health/index.js

@@ -6,10 +6,10 @@ const requestRecommen = (data) => {
         method: "get",
     });
 };
-const recommen = (url,data) => {
+const recommen = (url, data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `${url}`,
+        url: `${url}?rid=${data.rid}`,
         method: "post",
         data: data
     });
@@ -161,6 +161,13 @@ const healthsubFindWtHisValueForBj = (data) => {
         method: "get",
     });
 };
+const healthreportHealthReport = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `healthreport/healthReport?wtid=${data.wtid}&date=${data.date}`,
+        method: "get",
+    });
+};
 
 
 
@@ -190,4 +197,5 @@ export default {
     healthsubFindPowerChar,
     healthsubGetWeatherRealDay5Info,
     healthsubFindWtHisValueForBj,
+    healthreportHealthReport,
 }

src/api/wisdomOverhaul/lifecycle/index.js

@@ -0,0 +1,47 @@
+import request from "../../../tools/request";
+
+
+const companiesList = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `companies/list`,
+        method: "get",
+    });
+};
+const warehouseList = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `warehouse/list`,
+        method: "get",
+    });
+};
+const polineList = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `poline/list?vendor=${data.vendor}&ponum=${data.ponum}&warehouse=${data.warehouse}&starttime=${data.starttime}&endtime=${data.endtime}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
+        method: "get",
+    });
+};
+const windturbineList = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `windturbine/list?wtid=${data.wtid}`,
+        method: "get",
+    });
+};
+const equoperationrecordList = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `equoperationrecord/list?wtid=${data.wtid}&starttime=${data.starttime}&endtime=${data.endtime}&type=${data.type}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
+        method: "get",
+    });
+};
+
+export default {
+    companiesList,
+    warehouseList,
+    polineList,
+    windturbineList,
+    equoperationrecordList
+
+}

src/api/wisdomOverhaul/one/index.js

@@ -0,0 +1,13 @@
+import request from "../../../tools/request";
+
+const analysisDetail = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `/analysis/detail?station=${data.station}&startTs=${data.startTs}&endTs=${data.endTs}&interval=${data.interval}&wtId=${data.wtId}&name=${data.name}`,
+        method: "get",
+    });
+};
+
+export default {
+    analysisDetail
+}

src/api/wisdomOverhaul/windResources/index.js

@@ -2,7 +2,7 @@ import request from "../../../tools/request";
 const scatterAjax = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `scatter/scatterAjax?wpId=${data.wpId}&pjId=${data.pjId}&lnId=${data.lnId}&year=${data.year}&wpId=${data.month}`,
+        url: `scatter/scatterAjax?wpId=${data.wpId}&pjId=${data.pjId}&lnId=${data.lnId}&year=${data.year}&wpId=${data.month}&month=${data.month}`,
         method: "get",
     });
 };

src/views/Home/components/map/KB_FDC.vue

@@ -802,6 +802,7 @@ export default {
         // 点击事件
         element.addEventListener("click", function () {
           Array.prototype.forEach.call(elsImage, (ele, index) => {
+            console.log(ele,9999999999);
             // 遍历map-float元素 清空凸起
             ele.style.display = "none";
           });

src/views/Home/components/map/svg-map-nx.vue

@@ -169,10 +169,11 @@
         />
         <g>
           <g v-if="showPoint">
-            <!-- @click.stop="clickLabel('CL_FDC', '崇礼风电场')"  -->
+           
             <g
               v-if="showType === 'all' || showType === 'fc'"
               class="item-label"
+               @click.stop="clickLabel('CL_FDC', '崇礼风电场')" 
               @mouseover="mouseover(0)"
               @mouseout="mouseout"
             >
@@ -367,9 +368,10 @@
           </g>
 
           <g v-if="showPoint">
-            <!-- @click.stop="clickLabel('DX_FDC', '代县风电场')" -->
+           
             <g
               v-if="showType === 'all' || showType === 'fc'"
+               @click.stop="clickLabel('DX_FDC', '代县风电场')"
               class="item-label"
               @mouseover="mouseover(2)"
               @mouseout="mouseout"

src/views/LightMatrix1/LightMatrix1.vue

@@ -450,7 +450,9 @@ export default {
 
     // 请求服务
     requestData(showLoading) {
+      console.log(111111);
       api.matrixPush(showLoading).then((res) => {
+        console.log(res.data);
         if (res) {
           let sourceMap = res.data;
           let fjmap = [];

src/views/NewPages/statisticAnalysis.vue

@@ -18,7 +18,8 @@
 
     <div class="table1">
       <el-table
-        max-height="80vh"
+        max-height="86vh"
+         height="1100"
         v-loading="loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
         :data="tableData"
@@ -52,7 +53,7 @@
           <template #default="scope">
             <el-button
               @click="handleClick3(scope.row)"
-              :class="scope.row.isConfirm == 1 ? 'aaaa' : 'btn'"
+              :class="scope.row.isConfirm == 1 ? 'displayBtn' : 'btn'"
               :disabled="scope.row.isConfirm == 1"
             >
               确认</el-button
@@ -195,7 +196,7 @@ export default {
   border-radius: 5px;
 }
 .table1 {
-  margin-top: 60px;
+  margin-top: 30px;
 }
 /deep/.el-date-editor {
   width: 490px;
@@ -232,11 +233,11 @@ export default {
   border-color: #05bb4c;
 }
 
-.aaaa {
+.displayBtn {
   background-color: #4d4949;
   color: rgb(87 110 108);
 }
-.aaaa:hover {
+.displayBtn:hover {
   border: #4d4949;
   background-color: #4d4949;
   color: rgb(87 110 108);

src/views/SandTable/SandTable.vue

@@ -535,6 +535,8 @@ import Col from "@com/coms/grid/col.vue";
 import Row from "@com/coms/grid/row.vue";
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
 import hlsVideo from "./component/hls.vue";
+import api from "@api/wisdomOverhaul/one/index.js"
+// import api from "@api/wisdomOverhaul/windResource/index.js";
 
 export default {
   // 名称
@@ -778,11 +780,13 @@ export default {
     openVideoDialog1(item) {
       if (item.code) {
         this.dialogVideoUrl = item.code;
-        this.showVideoDialog = true;
+        // this.showVideoDialog = true;
       }
     },
 
     getWtInfo() {
+
+
       let that = this;
       that.API.requestData({
         method: "POST",

src/views/allLifeManage/tab1.vue

@@ -78,7 +78,8 @@
 
 <script>
 import ComTable from "@com/coms/table/table.vue";
-
+import api from "@api/wisdomOverhaul/lifecycle/index.js";
+import api1 from "@api/economic/index.js";
 export default {
   components: { ComTable },
   data() {
@@ -233,29 +234,41 @@ export default {
 
     // 获取厂家
     getVendor() {
-      let that = this;
-      that.API.requestData({
-        baseURL: "http://192.168.1.18:9988",
-        subUrl: "companies/list",
-        success(res) {
-          that.vendorArray = res.data;
-          that.vendor = res.data[0].company;
-          that.getWarehouse();
-        },
+      api.companiesList().then((res) => {
+        this.vendorArray = res.data;
+        this.vendor = res.data[0].company;
+        this.getWarehouse();
       });
+
+      // let that = this;
+      // that.API.requestData({
+      //   baseURL: "http://192.168.1.18:9988",
+      //   subUrl: "companies/list",
+      //   success(res) {
+      //     that.vendorArray = res.data;
+      //     that.vendor = res.data[0].company;
+      //     that.getWarehouse();
+      //   },
+      // });
     },
     // 获取仓库
     getWarehouse() {
-      let that = this;
-      that.API.requestData({
-        baseURL: "http://192.168.1.18:9988",
-        subUrl: "warehouse/list",
-        success(res) {
-          that.warehouseArray = res.data;
-          that.warehouse = res.data[0].warehouse;
-          that.requestSafeList();
-        },
+      api.benchmarkingLineList().then((res) => {
+        this.warehouseArray = res.data;
+        this.warehouse = res.data[0].warehouse;
+        this.requestSafeList();
       });
+
+      // let that = this;
+      // that.API.requestData({
+      //   baseURL: "http://192.168.1.18:9988",
+      //   subUrl: "warehouse/list",
+      //   success(res) {
+      //     that.warehouseArray = res.data;
+      //     that.warehouse = res.data[0].warehouse;
+      //     that.requestSafeList();
+      //   },
+      // });
     },
 
     // 格式化日期
@@ -318,40 +331,68 @@ export default {
         //   stationid: that.wpId,
         // };
 
-        // http://192.168.1.18:9988/poline/list?pagenum=1&pagesize=10&vendor=联合动力&ponum=PO10564&warehouse=麻黄山仓库&starttime=2021-07-08 18:34:40&endtime=2021-07-08 18:34:45
-        that.API.requestData({
-          // baseURL:"http://192.168.1.14:8075/",
-          baseURL: "http://192.168.1.18:9988",
-          subUrl: "poline/list",
-          method: "GET",
-          data: {
-            vendor: that.vendor,
-            ponum: that.ponum,
-            warehouse: that.warehouse,
+        api
+          .polineList({
+            vendor: this.vendor,
+            ponum: this.ponum,
+            warehouse: this.warehouse,
             starttime,
             endtime,
-            pagenum: that.pageNum,
-            pagesize: that.pageSize,
-          },
-          success(res) {
+            pagenum: this.pageNum,
+            pagesize: this.pageSize,
+          })
+          .then((res) => {
             if (res.data.records.length) {
               res.data.records.forEach((ele, index) => {
                 ele.index = index + 1;
-                ele.timeDate = that.fmtDate(new Date(ele.time));
+                ele.timeDate = this.fmtDate(new Date(ele.time));
                 if (ele.value > 0) {
                   ele.value = parseFloat(ele.value).toFixed(4);
                 }
               });
-              that.tableData.data = res.data.records || [];
+              this.tableData.data = res.data.records || [];
             } else {
               // that.BASE.showMsg({
               //   type: "warning",
               //   msg: "所选日期区间之内暂无数据，请重试",
               // });
             }
-            that.showDialog = true;
-          },
-        });
+            this.showDialog = true;
+          });
+
+        // that.API.requestData({
+        //   // baseURL:"http://192.168.1.14:8075/",
+        //   baseURL: "http://192.168.1.18:9988",
+        //   subUrl: "poline/list",
+        //   method: "GET",
+        //   data: {
+        //     vendor: that.vendor,
+        //     ponum: that.ponum,
+        //     warehouse: that.warehouse,
+        //     starttime,
+        //     endtime,
+        //     pagenum: that.pageNum,
+        //     pagesize: that.pageSize,
+        //   },
+        //   success(res) {
+        //     if (res.data.records.length) {
+        //       res.data.records.forEach((ele, index) => {
+        //         ele.index = index + 1;
+        //         ele.timeDate = that.fmtDate(new Date(ele.time));
+        //         if (ele.value > 0) {
+        //           ele.value = parseFloat(ele.value).toFixed(4);
+        //         }
+        //       });
+        //       that.tableData.data = res.data.records || [];
+        //     } else {
+        //       // that.BASE.showMsg({
+        //       //   type: "warning",
+        //       //   msg: "所选日期区间之内暂无数据，请重试",
+        //       // });
+        //     }
+        //     that.showDialog = true;
+        //   },
+        // });
       }
     },
   },

src/views/allLifeManage/tab2.vue

@@ -5,16 +5,37 @@
         <div class="query-item">
           <div class="lable">风场：</div>
           <div class="search-input">
-            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change="getWtArray">
-              <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"
+              @change="getWtArray"
+            >
+              <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>
@@ -31,17 +52,19 @@
 
 <script>
 import ComTable from "@com/coms/table/table.vue";
+import api from "@api/wisdomOverhaul/lifecycle/index.js";
+import api1 from "@api/economic/index.js";
 export default {
   // 名称
   name: "cutAnalyse",
 
   // 使用组件
   components: {
-    ComTable
+    ComTable,
   },
 
   // 数据
-  data () {
+  data() {
     const that = this;
     return {
       wpArray: [],
@@ -97,63 +120,63 @@ export default {
             field: "vendor",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "型号",
             field: "model",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "额定功率",
             field: "ratedpower",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "额定风速",
             field: "ratedwinspe",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "额定电压",
             field: "ratedvoltage",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "额定转速",
             field: "ratedrev",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "切入风速",
             field: "cutinwinspe",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "切出风速",
             field: "cutoutwinspe",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "生存风速",
             field: "maxwinspe",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           // {
           //   name: "最低温度",
@@ -215,7 +238,7 @@ export default {
             field: "installdate",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           // {
           //   name: "调试日期",
@@ -243,101 +266,123 @@ export default {
             field: "wflocation",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "风机ID",
             field: "wtid",
             is_num: false,
             is_light: false,
-            sortable: true
-          }
+            sortable: true,
+          },
         ],
         data: [],
-      }
+      },
     };
   },
 
   // 函数
   methods: {
     // 获取风场
-    getWpArray () {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windfarmAjax",
-        success (res) {
-          that.wpArray = res.data;
-          that.wpId = that.wpId || res.data[0].id;
-          that.getWtArray(that.wpId, true);
-        }
+    getWpArray() {
+      api1.benchmarkingWplist({}).then((res) => {
+        this.wpArray = res.data;
+        this.wpId = this.wpId || res.data[0].id;
+        this.getWtArray(this.wpId, true);
       });
     },
 
     // 获取风机
-    getWtArray (wpId, keepRequest) {
+    getWtArray(wpId, keepRequest) {
       let that = this;
       if (wpId) {
-        that.API.requestData({
-          method: "GET",
-          subUrl: "powercompare/windturbineAjax",
-          data: {
-            wpId
-          },
-          success (res) {
-            that.wtArray = res.data;
-            const findRes = res.data.some(ele => {
-              return ele.id === that.wtId;
+        api1
+          .powercompareWindturbineAjax({
+            wpId: wpId,
+          })
+          .then((res) => {
+            this.wtArray = res.data;
+            const findRes = res.data.some((ele) => {
+              return ele.id === this.wtId;
             });
-            that.wtId = (findRes ? that.wtId : res.data[0].id);
-            that.getTableData();
-          }
-        });
+            this.wtId = findRes ? this.wtId : res.data[0].id;
+            this.getTableData();
+          });
       } else {
         that.wtArray = [];
         that.wtId = "";
       }
     },
 
-    getTableData () {
+    getTableData() {
       let that = this;
       if (!that.wpId) {
         that.BASE.showMsg({
-          msg: "场站与日期不可为空"
+          msg: "场站与日期不可为空",
         });
       } else {
-        that.API.requestData({
-          method: "GET",
-          baseURL:"http://192.168.1.18:9988/",
-          subUrl: "windturbine/list",
-          data: {
-            wtid:that.wtId
-          },
-          success (res) {
-            res.data.forEach(ele => {
-              ele.installdate = new Date(ele.installdate).formatDate("yyyy-MM-dd hh:mm:ss");
-              ele.opdate = new Date(ele.opdate).formatDate("yyyy-MM-dd hh:mm:ss");
-              ele.releasedate = new Date(ele.releasedate).formatDate("yyyy-MM-dd hh:mm:ss");
-              ele.testdate = new Date(ele.testdate).formatDate("yyyy-MM-dd hh:mm:ss");
+        api
+          .windturbineList({
+            wtid: this.wtId,
+          })
+          .then((res) => {
+            res.data.forEach((ele) => {
+              ele.installdate = new Date(ele.installdate).formatDate(
+                "yyyy-MM-dd hh:mm:ss"
+              );
+              ele.opdate = new Date(ele.opdate).formatDate(
+                "yyyy-MM-dd hh:mm:ss"
+              );
+              ele.releasedate = new Date(ele.releasedate).formatDate(
+                "yyyy-MM-dd hh:mm:ss"
+              );
+              ele.testdate = new Date(ele.testdate).formatDate(
+                "yyyy-MM-dd hh:mm:ss"
+              );
             });
-            that.tableData.data = res.data;
-          }
-        });
+            this.tableData.data = res.data;
+          });
+
+        // that.API.requestData({
+        //   method: "GET",
+        //   baseURL: "http://192.168.1.18:9988/",
+        //   subUrl: "windturbine/list",
+        //   data: {
+        //     wtid: that.wtId,
+        //   },
+        //   success(res) {
+        //     res.data.forEach((ele) => {
+        //       ele.installdate = new Date(ele.installdate).formatDate(
+        //         "yyyy-MM-dd hh:mm:ss"
+        //       );
+        //       ele.opdate = new Date(ele.opdate).formatDate(
+        //         "yyyy-MM-dd hh:mm:ss"
+        //       );
+        //       ele.releasedate = new Date(ele.releasedate).formatDate(
+        //         "yyyy-MM-dd hh:mm:ss"
+        //       );
+        //       ele.testdate = new Date(ele.testdate).formatDate(
+        //         "yyyy-MM-dd hh:mm:ss"
+        //       );
+        //     });
+        //     that.tableData.data = res.data;
+        //   },
+        // });
       }
     },
 
-    search () {
+    search() {
       this.getTableData();
-    }
+    },
   },
 
-  created () {
+  created() {
     this.getWpArray();
   },
 
-  mounted () { },
+  mounted() {},
 
-  unmounted () { },
+  unmounted() {},
 };
 </script>
 
@@ -365,7 +410,7 @@ export default {
     margin-top: 1.481vh;
 
     &:before {
-      content: '';
+      content: "";
       width: 0.37vh;
       height: 0.37vh;
       background: @write;

src/views/allLifeManage/tab3.vue

@@ -5,38 +5,81 @@
         <div class="query-item">
           <div class="lable">风场：</div>
           <div class="search-input">
-            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change="getWtArray">
-              <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"
+              @change="getWtArray"
+            >
+              <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="starttime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+            <el-date-picker
+              v-model="starttime"
+              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="endtime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+            <el-date-picker
+              v-model="endtime"
+              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-select v-model="type" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in typeArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="type"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in typeArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
@@ -53,17 +96,19 @@
 
 <script>
 import ComTable from "@com/coms/table/table.vue";
+import api from "@api/wisdomOverhaul/lifecycle/index.js";
+import api1 from "@api/economic/index.js";
 export default {
   // 名称
   name: "cutAnalyse",
 
   // 使用组件
   components: {
-    ComTable
+    ComTable,
   },
 
   // 数据
-  data () {
+  data() {
     const that = this;
     return {
       wpArray: [],
@@ -71,19 +116,23 @@ export default {
       wtArray: [],
       wtId: "",
       type: "异动",
-      typeArray: [{
-        id: "检修",
-        label: "检修",
-        value: "检修"
-      }, {
-        id: "异动",
-        label: "异动",
-        value: "异动"
-      }, {
-        id: "故障",
-        label: "故障",
-        value: "故障"
-      }],
+      typeArray: [
+        {
+          id: "检修",
+          label: "检修",
+          value: "检修",
+        },
+        {
+          id: "异动",
+          label: "异动",
+          value: "异动",
+        },
+        {
+          id: "故障",
+          label: "故障",
+          value: "故障",
+        },
+      ],
       starttime: new Date().formatDate("yyyy-MM") + "-01",
       endtime: new Date().formatDate("yyyy-MM-dd"),
       tableData: {
@@ -93,144 +142,176 @@ export default {
             field: "leader",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "检修类型",
             field: "type",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "风机编号",
             field: "wtnum",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "开始时间",
             field: "starttime",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "结束时间",
             field: "endtime",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "检修原因",
             field: "problem",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "检修方式",
             field: "solveway",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "设备唯一编号",
             field: "eqnum",
             is_num: false,
             is_light: false,
-            sortable: true
-          }
+            sortable: true,
+          },
         ],
         data: [],
-      }
+      },
     };
   },
 
   // 函数
   methods: {
     // 获取风场
-    getWpArray () {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windfarmAjax",
-        success (res) {
-          that.wpArray = res.data;
-          that.wpId = that.wpId || res.data[0].id;
-          that.getWtArray(that.wpId, true);
-        }
+
+    getWpArray() {
+      api1.benchmarkingWplist({}).then((res) => {
+        this.wpArray = res.data;
+        this.wpId = this.wpId || res.data[0].id;
+        this.getWtArray(this.wpId, true);
       });
     },
+    // getWpArray() {
+    //   // let that = this;
+    //   // that.API.requestData({
+    //   //   method: "GET",
+    //   //   subUrl: "powercompare/windfarmAjax",
+    //   //   success (res) {
+    //   //     that.wpArray = res.data;
+    //   //     that.wpId = that.wpId || res.data[0].id;
+    //   //     that.getWtArray(that.wpId, true);
+    //   //   }
+    //   // });
+    // },
 
     // 获取风机
-    getWtArray (wpId, keepRequest) {
+    getWtArray(wpId, keepRequest) {
       let that = this;
       if (wpId) {
-        that.API.requestData({
-          method: "GET",
-          subUrl: "powercompare/windturbineAjax",
-          data: {
-            wpId
-          },
-          success (res) {
-            that.wtArray = res.data;
-            const findRes = res.data.some(ele => {
-              return ele.id === that.wtId;
+        api1
+          .powercompareWindturbineAjax({
+            wpId: wpId,
+          })
+          .then((res) => {
+            this.wtArray = res.data;
+            const findRes = res.data.some((ele) => {
+              return ele.id === this.wtId;
             });
-            that.wtId = (findRes ? that.wtId : res.data[0].id);
-            that.getTableData();
-          }
-        });
+            this.wtId = findRes ? this.wtId : res.data[0].id;
+            this.getTableData();
+          });
+
+        // that.API.requestData({
+        //   method: "GET",
+        //   subUrl: "powercompare/windturbineAjax",
+        //   data: {
+        //     wpId,
+        //   },
+        //   success(res) {
+        //     that.wtArray = res.data;
+        //     const findRes = res.data.some((ele) => {
+        //       return ele.id === that.wtId;
+        //     });
+        //     that.wtId = findRes ? that.wtId : res.data[0].id;
+        //     that.getTableData();
+        //   },
+        // });
       } else {
         that.wtArray = [];
         that.wtId = "";
       }
     },
 
-    getTableData () {
+    getTableData() {
       let that = this;
       if (!that.wpId || !that.starttime || !that.endtime) {
         that.BASE.showMsg({
-          msg: "场站与日期不可为空"
+          msg: "场站与日期不可为空",
         });
       } else {
-        that.API.requestData({
-          method: "GET",
-          baseURL: "http://192.168.1.18:9988/",
-          subUrl: "equoperationrecord/list",
-          data: {
-            wtid: that.wtId,
-            starttime: that.starttime,
-            endtime: that.endtime,
-            type: that.type,
+        api
+          .equoperationrecordList({
+            wtid: this.wtId,
+            starttime: this.starttime,
+            endtime: this.endtime,
+            type: this.type,
             pagenum: 1,
-            pagesize: 50000
-          },
-          success (res) {
-   
-            that.tableData.data = res.data.records;
-          }
-        });
+            pagesize: 50000,
+          })
+          .then((res) => {
+            this.tableData.data = res.data.records;
+          });
+
+        // that.API.requestData({
+        //   method: "GET",
+        //   baseURL: "http://192.168.1.18:9988/",
+        //   subUrl: "equoperationrecord/list",
+        //   data: {
+        //     wtid: that.wtId,
+        //     starttime: that.starttime,
+        //     endtime: that.endtime,
+        //     type: that.type,
+        //     pagenum: 1,
+        //     pagesize: 50000,
+        //   },
+        //   success(res) {
+        //     that.tableData.data = res.data.records;
+        //   },
+        // });
       }
     },
 
-
-    search () {
+    search() {
       this.getTableData();
-    }
+    },
   },
 
-  created () {
+  created() {
     this.getWpArray();
   },
 
-  mounted () { },
+  mounted() {},
 
-  unmounted () { },
+  unmounted() {},
 };
 </script>
 
@@ -258,7 +339,7 @@ export default {
     margin-top: 1.481vh;
 
     &:before {
-      content: '';
+      content: "";
       width: 0.37vh;
       height: 0.37vh;
       background: @write;

src/views/layout/Menu.vue

@@ -561,28 +561,28 @@ export default {
                 },
               ],
             },
-            {
-              text: "故障预警",
-              icon: "svg-预警记录",
-              path: "/health/MalfunctionWarning/",
-              children: [
-                {
-                  text: "无监督学习",
-                  icon: "svg-wind-site",
-                  path: "/health/MalfunctionWarning/",
-                },
-                {
-                  text: "有监督学习",
-                  icon: "svg-wind-site",
-                  path: "/health/MalfunctionWarning/Supervised",
-                },
-                {
-                  text: "齿轮箱故障诊断",
-                  icon: "svg-wind-site",
-                  path: "/health/MalfunctionWarning/diagnose",
-                },
-              ],
-            },
+            // {
+            //   text: "故障预警",
+            //   icon: "svg-预警记录",
+            //   path: "/health/MalfunctionWarning/",
+            //   children: [
+            //     {
+            //       text: "无监督学习",
+            //       icon: "svg-wind-site",
+            //       path: "/health/MalfunctionWarning/",
+            //     },
+            //     {
+            //       text: "有监督学习",
+            //       icon: "svg-wind-site",
+            //       path: "/health/MalfunctionWarning/Supervised",
+            //     },
+            //     {
+            //       text: "齿轮箱故障诊断",
+            //       icon: "svg-wind-site",
+            //       path: "/health/MalfunctionWarning/diagnose",
+            //     },
+            //   ],
+            // },
           ],
         },
         {

src/views/malfunctionDiagnose/index.vue

@@ -267,11 +267,12 @@ export default {
           values: item.judegvulue,
         })
         .then((res) => {
-          res.data[0].id = "0";
-          this.treeData = res.data;
-          this.dialogShow = true;
+          if (res.data[0]) {
+            res.data[0].id = "0";
+            this.treeData = res.data;
+            this.dialogShow = true;
+          }
         });
-
     },
 
     search() {

src/views/malfunctionRecall/index.vue

@@ -274,6 +274,8 @@ export default {
         beginDate: that.value1,
         endDate: that.value2,
         wpId: that.wpId,
+        type: 2,
+        wtId: null,
       };
 
       if (that.wtId != "") data.wtId = that.wtId;