update

src/api/economic/index.js

@@ -52,12 +52,6 @@ const targetdataJnjpkpi = (data) => {
     });
 };
 //风机绩效榜明细
-const benchmarkingWplist1 = (data) => {
-    return request({
-        url: `/consumer/benchmarking/wplist`,
-        method: "get",
-    });
-};
 
 // const benchmarkingLineList1 = (data) => {
 //     return request({
@@ -72,12 +66,6 @@ const benchmarkingDetails = (data) => {
         method: "get",
     });
 };
-const benchmarkingWplist2 = () => {
-    return request({
-        url: `/consumer/benchmarking/wplist`,
-        method: "get",
-    });
-}
 const benchmarkingWxssl = (data) => {
     return request({
         url: `/consumer/benchmarking/wxssl?wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
@@ -589,20 +577,6 @@ const paramComparisonGeneratingCurve = (data) => {
 
 };
 
-//等级评估--获取表格数据
-const levelAssessmentList = (data) => {
-    return request({
-        url: `/consumer/levelAssessment/list?recorddate=${data.recorddate}&type=${data.type}&wpid=${data.wpId}&orderby=${data.orderby}&isAsc=${data.isAsc}`,
-        method: "get",
-    });
-};
-//等级评估--对比
-const levelAssessmentComparison = (data) => {
-    return request({
-        url: `/consumer/levelAssessment/comparison?id1=${data.gaid1}&id2=${data.gaid2}`,
-        method: "get",
-    });
-};
 
 
 export default {
@@ -614,10 +588,8 @@ export default {
     benchmarkingDbmainbottom,
     benchmarkingDbmaintop,
     targetdataJnjpkpi,
-    benchmarkingWplist1,
     // benchmarkingLineList1,
     benchmarkingDetails,
-    benchmarkingWplist2,
     benchmarkingWxssl,
     benchmarkingCndb,
     benchmarkingCjdb,
@@ -685,6 +657,4 @@ export default {
     paramComparisonEquipmentStructure,
     paramComparisonEquipmentParams,
     paramComparisonGeneratingCurve,
-    levelAssessmentList,
-    levelAssessmentComparison
 }

src/api/wisdomOverhaul/fault/index.js

@@ -0,0 +1,39 @@
+import request from "../../../tools/request";
+
+//等级评估--获取表格数据
+const powercompareProjectAjax = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `powercompare/projectAjax?wpIds=${data.wpIds}`,
+        method: "get",
+    });
+};
+const stopanalysisStopAnalysisList = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `health/stopAnalysisList?wpId=${data.wpId}&isAsc=${data.isAsc}&modelId=${data.modelId}&typeId=${data.typeId}`,
+        method: "get",
+    });
+};
+const stopanalysisStopAnalysisTree = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `health/stopAnalysisTree?mainId=${data.mainId}&wtId=${data.wtId}&values=${data.values}`,
+        method: "get",
+    });
+};  
+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",
+    });
+};
+
+
+export default {
+    powercompareProjectAjax,
+    stopanalysisStopAnalysisList,
+    stopanalysisStopAnalysisTree,
+    eventGetShutdownevent,
+}

src/api/wisdomOverhaul/grade/index.js

@@ -0,0 +1,21 @@
+import request from "../../../tools/request";
+
+//等级评估--获取表格数据
+const levelAssessmentList = (data) => {
+    return request({
+        url: `/consumer/levelAssessment/list?recorddate=${data.recorddate}&type=${data.type}&wpid=${data.wpId}&orderby=${data.orderby}&isAsc=${data.isAsc}`,
+        method: "get",
+    });
+};
+//等级评估--对比
+const levelAssessmentComparison = (data) => {
+    return request({
+        url: `/consumer/levelAssessment/comparison?id1=${data.gaid1}&id2=${data.gaid2}`,
+        method: "get",
+    });
+};
+
+export default {
+    levelAssessmentList,
+    levelAssessmentComparison
+}

src/api/wisdomOverhaul/health/index.js

@@ -163,6 +163,9 @@ const healthsubFindWtHisValueForBj = (data) => {
 };
 
 
+
+
+
 export default {
     requestRecommen,
     recommen,

src/views/Decision/Decision2.vue

@@ -721,7 +721,7 @@ export default {
   },
   methods: {
     ChangZhanVal() {
-      api.benchmarkingWplist2({}).then((res) => {
+      api.benchmarkingWplist({}).then((res) => {
         //   that.value2.push(res.data[0].id);
         this.ChangZhan = res.data;
         //  that.AjaxCommon();

src/views/Decision/Decision2Cjdb.vue

@@ -714,7 +714,7 @@ export default {
   methods: {
     ChangZhanVal() {
 
-api.benchmarkingWplist2({
+api.benchmarkingWplist({
         
       }).then((res) => {
         this.ChangZhan = res.data;

src/views/Decision/Decision2Cndb.vue

@@ -692,7 +692,7 @@ export default {
     ChangZhanVal() {
 
 
-api.benchmarkingWplist2({
+api.benchmarkingWplist({
        
       }).then((res) => {
         this.ChangZhan = res.data;

src/views/Decision/Decision2Xldb.vue

@@ -755,7 +755,7 @@ export default {
     this.value4 = this.getTime(1);
     this.value5 = this.getTime(2);
 
-    api.benchmarkingWplist1({}).then((res) => {
+    api.benchmarkingWplist({}).then((res) => {
       this.value1.push(res.data[0].id);
       this.AjaxCommon();
       this.ChangZhanChange(this.value1)
@@ -773,7 +773,7 @@ export default {
   },
   methods: {
     ChangZhanVal() {
-      api.benchmarkingWplist1({}).then((res) => {
+      api.benchmarkingWplist({}).then((res) => {
         this.oneData = res.data[0].id;
         this.ChangZhan = res.data;
       });

src/views/Decision/Decision2Xmdb.vue

@@ -724,7 +724,7 @@ export default {
   },
   methods: {
     ChangZhanVal() {
-      api.benchmarkingWplist2({}).then((res) => {
+      api.benchmarkingWplist({}).then((res) => {
         this.ChangZhan = res.data;
         this.AjaxCommon();
       });

src/views/Decision/Decision3.vue

@@ -783,7 +783,7 @@ export default {
   methods: {
     ChangZhanVal() {
 
-      api.benchmarkingWplist2().then((res) => {
+      api.benchmarkingWplist().then((res) => {
         this.ChangZhan = res.data;
       });
 

src/views/Decision/Decision3Db.vue

@@ -225,7 +225,7 @@ export default {
   },
   methods: {
     ChangZhanVal() {
-      api.benchmarkingWplist1({}).then((res) => {
+      api.benchmarkingWplist({}).then((res) => {
         this.ChangZhan = res.data;
         this.value1 = res.data[0].code
         this.XiangMuVal(res.data[0].code)

src/views/HealthControl/assess/assessindex.vue

@@ -112,7 +112,8 @@
 import ComTable from "@/components/coms/table/table-unpage.vue";
 import Dayinfo from "../dayinfo.vue";
 import GradeHistory from "../gradeHistory.vue";
-import api from "@api/economic/index.js";
+import api1 from "@api/economic/index.js";
+import api from "@api/wisdomOverhaul/grade/index.js"
 import { registerLoading } from "echarts";
 export default {
   name: "gradeassessment",
@@ -446,7 +447,7 @@ export default {
     },
     // 场站
     ChangZhanVal() {
-      api.benchmarkingWplist({}).then((res) => {
+      api1.benchmarkingWplist({}).then((res) => {
         this.ChangZhan = res.data;
         this.value1 = res.data[0].id;
       });

src/views/malfunctionDiagnose/index.vue

@@ -82,8 +82,8 @@
       </div>
       <div class="query-actions">
         <button class="btn green" @click="search()">查询</button>
-		<!-- <button class="btn green" @click="">导入</button> -->
-		<button class="btn green" @click="export">导出</button>
+        <!-- <button class="btn green" @click="">导入</button> -->
+        <button class="btn green" @click="export">导出</button>
       </div>
     </div>
     <div class="df-table">
@@ -123,7 +123,8 @@
 
 <script>
 import ComTable from "@com/coms/table/table.vue";
-import api from "@api/economic/index.js";
+import api1 from "@api/economic/index.js";
+import api from "@api/wisdomOverhaul/fault/index.js";
 export default {
   // 名称
   name: "cutAnalyse",
@@ -214,43 +215,24 @@ export default {
   methods: {
     // 请求服务
     requestData() {
-
-      api.benchmarkingWplist({}).then((res) => {
-            this.wpArray = res.data;
-          this.wpId = res.data[0].id;
-          this.getProject();
+      api1.benchmarkingWplist({}).then((res) => {
+        this.wpArray = res.data;
+        this.wpId = res.data[0].id;
+        this.getProject();
       });
-
-
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   subUrl: "powercompare/windfarmAjax",
-      //   success(res) {
-      //     that.wpArray = res.data;
-      //     that.wpId = res.data[0].id;
-      //     that.getProject();
-      //   },
-      // });
     },
 
     // 获取期数
     getProject() {
-      
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/projectAjax",
-        data: {
-          wpIds: that.wpId,
-        },
-        success(res) {
-          that.projectArray = res.data;
-          that.projectId = res.data[0].id;
-          that.getTableData();
-        },
-      });
+      api
+        .powercompareProjectAjax({
+          wpIds: this.wpId,
+        })
+        .then((res) => {
+          this.projectArray = res.data;
+          this.projectId = res.data[0].id;
+          this.getTableData();
+        });
     },
 
     getTableData() {
@@ -264,61 +246,55 @@ export default {
           msg: "模型与时间类型不可为空",
         });
       } else {
-        that.API.requestData({
-          method: "POST",
-          subUrl: "stopanalysis/stopAnalysisList",
-          data: {
-            wpId: that.wpId,
-            isAsc: that.isAsc,
-            modelId: that.modelId,
-            typeId: that.typeId,
-          },
-          success(res) {
-            that.tableData.data = res.data;
-          },
-        });
+        api
+          .stopanalysisStopAnalysisList({
+            wpId: this.wpId,
+            isAsc: this.isAsc,
+            modelId: this.modelId,
+            typeId: this.typeId,
+          })
+          .then((res) => {
+            this.tableData.data = res.data;
+          });
       }
     },
     // 获取故障诊断树
     getTree(item) {
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "stopanalysis/stopAnalysisTree",
-        data: {
+      api
+        .stopanalysisStopAnalysisTree({
           mainId: item.id,
           wtId: item.wtid,
           values: item.judegvulue,
-        },
-        success(res) {
+        })
+        .then((res) => {
           res.data[0].id = "0";
-          that.treeData = res.data;
-          that.dialogShow = true;
-        },
-      });
+          this.treeData = res.data;
+          this.dialogShow = true;
+        });
+
     },
 
     search() {
       this.getTableData();
     },
-	formatJson(filterVal, jsonData) {
-		return jsonData.map(v => filterVal.map(j => v[j]));
-	},
-	export() {
-		let that = this;
-		const {export_json_to_excel} = require('@tools/excel/Export2Excel.js'); // 注意这个Export2Excel路径      
-		let tHeader = []; // 上面设置Excel的表格第一行的标题       
-		let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
-	
-		that.tableData.column.forEach(ele => {
-			if(ele.field != 'cz'){
-				tHeader.push(ele.name);
-				filterVal.push(ele.field);
-			}
-		});
-		const data = that.formatJson(filterVal, that.tableData.data);
-		export_json_to_excel(tHeader, data, '故障诊断'); // 最后一个是表名字
-	},
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    export() {
+      let that = this;
+      const { export_json_to_excel } = require("@tools/excel/Export2Excel.js"); // 注意这个Export2Excel路径
+      let tHeader = []; // 上面设置Excel的表格第一行的标题
+      let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
+
+      that.tableData.column.forEach((ele) => {
+        if (ele.field != "cz") {
+          tHeader.push(ele.name);
+          filterVal.push(ele.field);
+        }
+      });
+      const data = that.formatJson(filterVal, that.tableData.data);
+      export_json_to_excel(tHeader, data, "故障诊断"); // 最后一个是表名字
+    },
   },
 
   created() {

src/views/malfunctionRecall/index.vue

@@ -112,7 +112,7 @@
         :close-on-click-modal="false"
         :before-close="onClickDialogClose"
       >
-        <fault-diagnosis :data="rowitem" ref="rowitemS" :key="componentKey"/>
+        <fault-diagnosis :data="rowitem" ref="rowitemS" :key="componentKey" />
       </el-dialog>
     </div>
   </div>
@@ -121,13 +121,15 @@
 <script>
 import ComTable from "@com/coms/table/table.vue";
 import FaultDiagnosis from "./components/fault-diagnosis.vue";
+import api from "@api/wisdomOverhaul/fault/index.js";
+import api1 from "@api/economic/index.js";
 
 export default {
   components: { ComTable, FaultDiagnosis },
   data() {
     const that = this;
     return {
-	componentKey:0,
+      componentKey: 0,
       value1: "",
       value2: "",
       wpId: "",
@@ -189,7 +191,7 @@ export default {
             template() {
               return "<el-button type='text' style='cursor: pointer;'>回溯</el-button>";
             },
-             click(e, row) {
+            click(e, row) {
               that.onClickOption(row);
             },
           },
@@ -224,17 +226,12 @@ export default {
     },
     // 获取风场
     getWp(reGetWp) {
-      let that = this;
-      that.API.requestData({
-        baseURL: "http://10.83.68.97:8020",
-        subUrl: "/consumer/benchmarking/wplist",
-        success(res) {
-          that.wpArray = res.data;
-          that.wpId = res.data[0].id;
-          that.wpName = res.data[0].wpName;
-          that.getWt(that.wpId, reGetWp);
-          that.requestSafeList();
-        },
+      api1.benchmarkingWplist().then((res) => {
+        this.wpArray = res.data;
+        this.wpId = res.data[0].id;
+        this.wpName = res.data[0].wpName;
+        this.getWt(this.wpId, reGetWp);
+        this.requestSafeList();
       });
     },
 
@@ -242,18 +239,14 @@ export default {
     getWt(wpid, reGetWp) {
       let that = this;
       if (that.wpId) {
-        that.API.requestData({
-          method: "GET",
-          baseURL: "http://10.155.32.4:9001",
-          subUrl: "benchmarking/wtList",
-          data: {
+        api1
+          .benchmarkingWtList({
             wpid,
-          },
-          success(res) {
-            that.wtArray = res.data;
+          })
+          .then((res) => {
+            this.wtArray = res.data;
             // that.wtId = res.data[0].id;
-          },
-        });
+          });
       }
     },
     BeginChange(vl) {
@@ -286,45 +279,40 @@ export default {
       if (that.wtId != "") data.wtId = that.wtId;
       if (that.type != "") data.type = that.type;
 
-      this.API.requestData({
-        method: "POST",
-        subUrl: "/event/getShutdownevent",
-        data,
-        success(res) {
-          if (res.code == 200) {
-            that.tableData.data = [];
-            if (res.data.list.length) {
-              let data = res.data.list;
-              for (var i = 0; i < data.length; i++) {
-                let obj = {
-                  wpName: data[i].wpName,
-                  windTurbineId: data[i].windTurbineId,
-                  stopTime: new Date(data[i].stopTime).formatDate(
-                    "yyyy-MM-dd hh:mm:ss"
-                  ),
+      api.eventGetShutdownevent(data).then((res) => {
+        if (res.code == 200) {
+          this.tableData.data = [];
+          if (res.data.list.length) {
+            let data = res.data.list;
+            for (var i = 0; i < data.length; i++) {
+              let obj = {
+                wpName: data[i].wpName,
+                windTurbineId: data[i].windTurbineId,
+                stopTime: new Date(data[i].stopTime).formatDate(
+                  "yyyy-MM-dd hh:mm:ss"
+                ),
 
-                  stopHours: data[i].stopHours,
-                  statusName: data[i].statusName,
-                  warnDesc: data[i].warnDesc,
-                  lossPower: data[i].lossPower,
-                  handleWay: data[i].handleWay,
-                };
-                if (data[i].startTime)
-                  obj.startTime = new Date(data[i].startTime).formatDate(
-                    "yyyy-MM-dd hh:mm:ss"
-                  );
-                that.tableData.data.push(obj);
-              }
+                stopHours: data[i].stopHours,
+                statusName: data[i].statusName,
+                warnDesc: data[i].warnDesc,
+                lossPower: data[i].lossPower,
+                handleWay: data[i].handleWay,
+              };
+              if (data[i].startTime)
+                obj.startTime = new Date(data[i].startTime).formatDate(
+                  "yyyy-MM-dd hh:mm:ss"
+                );
+              this.tableData.data.push(obj);
             }
           }
-        },
+        }
       });
     },
     // 回放按钮
     onClickOption(row) {
       this.rowitem = row;
       this.dialogVisible = true;
-	  this.componentKey += 1;
+      this.componentKey += 1;
     },
     // 关闭弹窗
     onClickDialogClose() {