update

src/api/economic/index.js

@@ -6,6 +6,13 @@ const benchmarking = (data) => {
         method: "get",
     });
 };
+//风机绩效榜
+const benchmarkingmx = (data) => {
+    return request({
+        url: `/consumer/benchmarking/fjjxbmx?wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&type=${data.type}&target=${data.target}&sort=${data.sort}`,
+        method: "get",
+    });
+};
 const benchmarkingLineList = (data) => {
     return request({
         url: `/consumer/benchmarking/lineList?projects=${data.projects}`,
@@ -600,6 +607,7 @@ const levelAssessmentComparison = (data) => {
 
 export default {
     benchmarking,
+    benchmarkingmx,
     benchmarkingLineList,
     benchmarkingWplist,
     benchmarkingProjectList,

src/views/Decision/Decision1Mx.vue

@@ -395,14 +395,8 @@ export default {
   },
   methods: {
     ChangZhanVal() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/wplist",
-        success(res) {
-          that.ChangZhan = res.data;
-        },
+      api.benchmarkingWplist({}).then((res) => {
+        this.ChangZhan = res.data;
       });
     },
     ChangZhanChange(val) {
@@ -414,17 +408,10 @@ export default {
       this.XiangMuVal(val);
     },
     XiangMuVal(val) {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/projectList",
-        data: {
-          wpids: val,
-        },
-        success(res) {
-          that.XiangMu = res.data;
-        },
+      api.benchmarkingProjectList({
+        wpids: val,
+      }).then((res) => {
+        this.XiangMu = res.data;
       });
     },
     XiangMuChange(val) {
@@ -435,17 +422,10 @@ export default {
       this.XianLuVal(val);
     },
     XianLuVal(val) {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/lineList",
-        data: {
-          projects: val,
-        },
-        success(res) {
-          that.XianLu = res.data;
-        },
+      api.benchmarkingLineList({
+        projects: val,
+      }).then((res) => {
+        this.XianLu = res.data
       });
     },
     XianLuChange(val) {
@@ -488,118 +468,118 @@ export default {
         return end;
       }
     },
-    AjaxCommon() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "http://10.83.66.220:8020/mx",
-        data: {
-          wpids: that.value1,
-          projectids: that.value2,
-          lineids: that.value3,
-          beginDate: that.value4,
-          endDate: that.value5,
-          type: that.TypeClass,
-          target: "",
-          sort: "",
-        },
-        success(res) {
-          var name = [],
-            data = [],
-            llfdl = [],
-            legend = [
-              "实际电量",
-              "故障损失",
-              "故障受累",
-              "检修受累",
-              "电网受累",
-              "天气受累",
-              "限电降出",
-              "限电停机",
-              "待风损失",
-              "手动停机",
-              "正常发电",
-              "缺陷降出",
-            ],
-            data2 = []; //项目列表
-
-          if (that.value1.length) {
-            let arr = [];
-            let hj = res.data.pop();
-            res.data.forEach((ele, index) => {
-              arr[ele.id.split("_")[1] - 1] = ele;
-            });
-            arr.push(hj);
-            res.data = arr;
-          }
-
-          res.data.forEach((item, index) => {
-            name.push(item.name);
-            llfdl.push(item.llfdl);
-            data.push([
-              item.sjfdl,
-              item.fjhjx1,
-              item.fjhjx2,
-              item.jhjx1,
-              item.jhjx2,
-              item.sl1,
-              item.sl2,
-              item.xd1,
-              item.xd2,
-              item.xn1,
-              item.xn2,
-              item.xn3,
-              item.xn4,
-            ]);
-            data2.push({
-              index: index + 1,
-              name: item.name,
-              llfdl: item.llfdl,
-              sjfdl: item.sjfdl,
-              speed: item.speed,
-              fjhjx1: item.fjhjx1,
-              fjhjx2: item.fjhjx2,
-              jhjx1: item.jhjx1,
-              jhjx2: item.jhjx2,
-              sl1: item.sl1,
-              sl2: item.sl2,
-              xd1: item.xd1,
-              xd2: item.xd2,
-              xn1: item.xn1,
-              xn2: item.xn2,
-              xn3: item.xn3,
-              xn4: item.xn4,
-              fnlly: item.fnlly,
-              is_light: false,
-            });
-          });
-          name.pop();
-          data.pop();
-          llfdl.pop();
-          if (data.length > 0) {
-            let arr1 = [];
-            const length = data[0].length;
-            for (var i = 0; i < length; i++) {
-              let arr2 = [];
-              data.forEach((ele) => {
-                arr2.push(ele[i]);
-              });
-              arr1.push(arr2);
-            }
-            that.lineData = llfdl;
-            that.bardata = {
-              area: name,
-              legend: legend,
-              data: arr1,
-            };
-          }
-          that.tableDataEnd = data2[data2.length - 1];
-          data2.pop();
-          that.tableData.data = data2;
-        },
-      });
-    },
+    // AjaxCommon() {
+    //   var that = this;
+    //   that.API.requestData({
+    //     method: "GET",
+    //     baseURL: "http://10.83.66.220:8020/",
+    //     subUrl: "http://10.83.66.220:8020/mx",
+    //     data: {
+    //       wpids: that.value1,
+    //       projectids: that.value2,
+    //       lineids: that.value3,
+    //       beginDate: that.value4,
+    //       endDate: that.value5,
+    //       type: that.TypeClass,
+    //       target: "",
+    //       sort: "",
+    //     },
+    //     success(res) {
+    //       var name = [],
+    //         data = [],
+    //         llfdl = [],
+    //         legend = [
+    //           "实际电量",
+    //           "故障损失",
+    //           "故障受累",
+    //           "检修受累",
+    //           "电网受累",
+    //           "天气受累",
+    //           "限电降出",
+    //           "限电停机",
+    //           "待风损失",
+    //           "手动停机",
+    //           "正常发电",
+    //           "缺陷降出",
+    //         ],
+    //         data2 = []; //项目列表
+
+    //       if (that.value1.length) {
+    //         let arr = [];
+    //         let hj = res.data.pop();
+    //         res.data.forEach((ele, index) => {
+    //           arr[ele.id.split("_")[1] - 1] = ele;
+    //         });
+    //         arr.push(hj);
+    //         res.data = arr;
+    //       }
+
+    //       res.data.forEach((item, index) => {
+    //         name.push(item.name);
+    //         llfdl.push(item.llfdl);
+    //         data.push([
+    //           item.sjfdl,
+    //           item.fjhjx1,
+    //           item.fjhjx2,
+    //           item.jhjx1,
+    //           item.jhjx2,
+    //           item.sl1,
+    //           item.sl2,
+    //           item.xd1,
+    //           item.xd2,
+    //           item.xn1,
+    //           item.xn2,
+    //           item.xn3,
+    //           item.xn4,
+    //         ]);
+    //         data2.push({
+    //           index: index + 1,
+    //           name: item.name,
+    //           llfdl: item.llfdl,
+    //           sjfdl: item.sjfdl,
+    //           speed: item.speed,
+    //           fjhjx1: item.fjhjx1,
+    //           fjhjx2: item.fjhjx2,
+    //           jhjx1: item.jhjx1,
+    //           jhjx2: item.jhjx2,
+    //           sl1: item.sl1,
+    //           sl2: item.sl2,
+    //           xd1: item.xd1,
+    //           xd2: item.xd2,
+    //           xn1: item.xn1,
+    //           xn2: item.xn2,
+    //           xn3: item.xn3,
+    //           xn4: item.xn4,
+    //           fnlly: item.fnlly,
+    //           is_light: false,
+    //         });
+    //       });
+    //       name.pop();
+    //       data.pop();
+    //       llfdl.pop();
+    //       if (data.length > 0) {
+    //         let arr1 = [];
+    //         const length = data[0].length;
+    //         for (var i = 0; i < length; i++) {
+    //           let arr2 = [];
+    //           data.forEach((ele) => {
+    //             arr2.push(ele[i]);
+    //           });
+    //           arr1.push(arr2);
+    //         }
+    //         that.lineData = llfdl;
+    //         that.bardata = {
+    //           area: name,
+    //           legend: legend,
+    //           data: arr1,
+    //         };
+    //       }
+    //       that.tableDataEnd = data2[data2.length - 1];
+    //       data2.pop();
+    //       that.tableData.data = data2;
+    //     },
+    //   });
+    // },
     mxClick() {
       this.$router.push("/decision/decision1");
     },
@@ -696,7 +676,7 @@ export default {
     },
     AjaxCommon() {
       api
-        .benchmarking({
+        .benchmarkingmx({
           wpids: this.value1,
           projectids: this.value2,
           lineids: this.value3,
@@ -707,7 +687,6 @@ export default {
           sort: "",
         })
         .then((res) => {
-          console.log(res);
           var name = [],
             data = [],
             llfdl = [],