update

src/api/economic/index.js

@@ -1,5 +1,5 @@
 import request from "../../tools/request";
-//登陆
+//风机绩效榜
 const benchmarking = (data) => {
     return request({
         baseURL:process.env.VUE_APP_API,
@@ -8,7 +8,438 @@ const benchmarking = (data) => {
         data: data,
     });
 };
+const benchmarkingLineList = (data) => {
+    return request({
+        url: `/consumer/benchmarking/lineList?projects=${data.projects}`,
+        method: "get",
+    });
+};
+const benchmarkingWplist = (data) => {
+    return request({
+        url: `/consumer/benchmarking/wplist`,
+        method: "get",
+    });
+};
+const benchmarkingProjectList = (data) => {
+    return request({
+        url: `/consumer/benchmarking/projectList?wpids=${data.wpids}`,
+        method: "get",
+    });
+};
+// *************************  NewPages  power-benchmarking.vue
+const benchmarkingDbmainbottom = (data) => {
+    return request({
+        url: `benchmarking/dbmainbottom?timetype=${data.timetype}&foreigntype=${data.foreigntype}`,
+        method: "get",
+    });
+};
+const benchmarkingDbmaintop = (data) => {
+    return request({
+        url: `benchmarking/dbmaintop?timetype=${data.timetype}&foreigntype=${data.foreigntype}`,
+        method: "get",
+    });
+};
+// 节能减排KPI
+const targetdataJnjpkpi = (data) => {
+    return request({
+        url: `targetdata/jnjpkpi?month=${data.month}`,
+        method: "get",
+    });
+};
+//风机绩效榜明细
+const benchmarkingWplist1 = (data) => {
+    return request({
+        url: `benchmarking/wplist`,
+        method: "get",
+    });
+};
+const benchmarkingProjectList1 = (data) => {
+    return request({
+        url: `benchmarking/projectList?month=${data.wpids}`,
+        method: "get",
+    });
+};
+const benchmarkingLineList1 = (data) => {
+    return request({
+        url: `benchmarking/lineList?month=${data.projects}`,
+        method: "get",
+    });
+};
+//五项损失率
+const benchmarkingDetails = (data) => {
+    return request({
+        url: `benchmarking/details?id=${data.id}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
+        method: "get",
+    });
+};
+const benchmarkingWplist2 = (data) => {
+    return request({
+        url: `benchmarking/wplist`,
+        method: "get",
+    });
+};
+const benchmarkingProjectList2 = (data) => {
+    return request({
+        url: `benchmarking/projectList?wpids=${data.wpids}`,
+        method: "get",
+    });
+};
+const benchmarkingLineList2 = (data) => {
+    return request({
+        url: `benchmarking/lineList?projects=${data.projects}`,
+        method: "get",
+    });
+};
+const benchmarkingWxssl = (data) => {
+    return request({
+        url: `benchmarking/wxssl?wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
+        method: "get",
+    });
+};
+//场内对标
+const benchmarkingCndb = (data) => {
+    return request({
+        url: `benchmarking/cndb?wpid=${data.wpid}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
+        method: "get",
+    });
+};
+//场际对标
+const benchmarkingCjdb = (data) => {
+    return request({
+        url: `benchmarking/cjdb?wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
+        method: "get",
+    });
+};
+//项目对标
+const benchmarkingXmdb = (data) => {
+    return request({
+        url: `benchmarking/xmdb?wpids=${data.wpids}&projectids=${data.projectids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
+        method: "get",
+    });
+};
+
+//线路对标
+const benchmarkingXldb = (data) => {
+    return request({
+        url: `benchmarking/xldb?wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
+        method: "get",
+    });
+};
+//性能对标
+
+
+//值际对标
+
+const benchmarkingZjwxssl = (data) => {
+    return request({
+        url: `benchmarking/zjwxssl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
+        method: "get",
+    });
+};
+
+//操作指令统计
+const benchmarkingZjlist = (data) => {
+    return request({
+        url: `benchmarking/zjlist?beginDate=${data.beginDate}&endDate=${data.endDate}`,
+        method: "get",
+    });
+};
+
+const benchmarkingZjdrill = (data) => {
+    return request({
+        url: `benchmarking/zjdrill?beginDate=${data.beginDate}&endDate=${data.endDate}&dutyname=${data.dutyname}&direct=${data.direct}`,
+        method: "get",
+    });
+};
+
+//单机横向对比
+
+const benchmarkingWtList = (data) => {
+    return request({
+        url: `benchmarking/wtList?wpids=${data.wpids}`,
+        method: "get",
+    });
+};
+
+const ajaxName = (data) => {
+    return request({
+        url: `benchmarking/${data.ajaxName}?wpids=${data.wpids}&wtids=${data.wtids}&date=${data.date}&target=${data.target}&sort=${data.sort}`,
+        method: "get",
+    });
+};
+const benchmarkingDjhxdbbottom = (data) => {
+    return request({
+        url: `benchmarking/djhxdbbottom?wpid=${data.wpid}&wtids=${data.wtids}&date=${data.date}`,
+        method: "get",
+    });
+};
+
+// 三率管理/复位及时率
+const threerateFwjsl = (data) => {
+    return request({
+        url: `/threerate/fwjsl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
+        method: "get",
+    });
+};
+// 三率管理/状态转换率
+const threerateZtzhl = (data) => {
+    return request({
+        url: `threerate/ztzhl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
+        method: "get",
+    });
+};
+// 三率管理/消缺及时率
+const threerateXqjsl = (data) => {
+    return request({
+        url: `threerate/xqjsl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
+        method: "get",
+    });
+};
+
+// 发电效率排行
+const powercompareWindfarmAllAjax = (data) => {
+    return request({
+        url: `powercompare/windfarmAllAjax?type=${data.type}`,
+        method: "get",
+    });
+};
+
+const leaderboardLoadfactortoplist = (data) => {
+    return request({
+        url: `leaderboard/loadfactortoplist`,
+        method: "post",
+        data:data
+    });
+};
+// 总发电效率排行
+const leaderboardTotalPowerCapacityTopList = (data) => {
+    return request({
+        url: `leaderboard/totalPowerCapacityTopList?wpIps=${data.wpIps}&isAsc=${data.isAsc}&beginDate=${data.beginDate}&endDate=${data.endDate}&orderByColumn=${data.orderByColumn}`,
+        method: "get",
+    });
+};
+// 报警排行
+const leaderboardQuerywarningStatistical = (data) => {
+    return request({
+        url: `leaderboard/querywarningStatistical`,
+        method: "post",
+        data:data
+    });
+};
+// 专题分析
+const  specificMaincenterlist = (data) => {
+    return request({
+        url: `/specific/maincenterlist?month=${data.month}`,
+        method: "get",
+    });
+};
+const  specificMaintoplist = (data) => {
+    return request({
+        url: `/specific/maintoplist?month=${data.month}`,
+        method: "get",
+    });
+};
+// 风能利用率
+const  specificFnlylList = (data) => {
+    return request({
+        url: `/specific/fnlylList?year=${data.year}`,
+        method: "get",
+    });
+};
+
+// 维护损失率
+const  specificWhsslList = (data) => {
+    return request({
+        url: `/specific/fnlylList?year=${data.year}`,
+        method: "get",
+    });
+};
+ // 故障损失率
+ const  specificGzsslList = (data) => {
+    return request({
+        url: `/specific/gzsslList?year=${data.year}`,
+        method: "get",
+    });
+};
+
+// 限电损失率
+const  specificXdsslList = (data) => {
+    return request({
+        url: `/specific/xdsslList?year=${data.year}`,
+        method: "get",
+    });
+};
+
+// 性能损失率
+const  specificXnsslList = (data) => {
+    return request({
+        url: `/specific/xnsslList?year=${data.year}`,
+        method: "get",
+    });
+};
+
+// 受累损失率
+const  specificSlsslList = (data) => {
+    return request({
+        url: `/specific/slsslList?year=${data.year}`,
+        method: "get",
+    });
+};
+// mtbf
+const  specificMtbfList = (data) => {
+    return request({
+        url: `/specific/mtbfList?year=${data.year}`,
+        method: "get",
+    });
+};
+
+ // mttr
+ const  specificMttrList = (data) => {
+    return request({
+        url: `/specific/mttrList?year=${data.year}`,
+        method: "get",
+    });
+};
+// 复位及时率
+const  specificFwjslList = (data) => {
+    return request({
+        url: `/specific/fwjslList?year=${data.year}`,
+        method: "get",
+    });
+};
+// 状态转换率
+const  specificZtzhlList = (data) => {
+    return request({
+        url: `/specific/ztzhlList?year=${data.year}`,
+        method: "get",
+    });
+};
+
+ // 消缺及时率
+ const  specificXqjslList = (data) => {
+    return request({
+        url: `/specific/xqjslList?year=${data.year}`,
+        method: "get",
+    });
+};
+// 发电量分析
+const  specificFdlList = (data) => {
+    return request({
+        url: `/specific/fdlList?year=${data.year}`,
+        method: "get",
+    });
+};
+// 综合场用电量
+const  specificZhcydlList = (data) => {
+    return request({
+        url: `/specific/zhcydlList?year=${data.year}`,
+        method: "get",
+    });
+};
+// 单机信息总览
+const  powercompareWindfarmAjax = (data) => {
+    return request({
+        url: `powercompare/windfarmAjax`,
+        method: "get",
+    });
+};
+const  goodnessWindturbinegoodness = (data) => {
+    return request({
+        url: `goodness/windturbinegoodness`,
+        method: "post",
+        data:data
+    });
+};
+
+const  powercompareWindturbineAjax = (data) => {
+    return request({
+        url: `powercompare/windturbineAjax?wpId=${data.wpId}`,
+        method: "get",
+    });
+};
+
+const  goodnessGoodhistorylist = (data) => {
+    return request({
+        url: `goodness/goodhistorylist`,
+        method: "post",
+        data:data
+    });
+};
+// 单机信息总览详情
+
+const  goodnessFindWtRealPowerChar = (data) => {
+    return request({
+        url: `goodness/findWtRealPowerChar`,
+        method: "post",
+        data:data
+    });
+};
+const  goodnessGetplotBands = (data) => {
+    return request({
+        url: `goodness/getplotBands`,
+        method: "post",
+        data:data
+    });
+};
+
+
+
+
+
+
 
 export default {
     benchmarking,
+    benchmarkingLineList,
+    benchmarkingWplist,
+    benchmarkingProjectList,
+    benchmarkingDbmainbottom,
+    benchmarkingDbmaintop,
+    targetdataJnjpkpi,
+    benchmarkingWplist1,
+    benchmarkingProjectList1,
+    benchmarkingLineList1,
+    benchmarkingDetails,
+    benchmarkingWplist2,
+    benchmarkingProjectList2,
+    benchmarkingLineList2,
+    benchmarkingWxssl,
+    benchmarkingCndb,
+    benchmarkingCjdb,
+    benchmarkingXmdb,
+    benchmarkingXldb,
+    benchmarkingZjwxssl,
+    benchmarkingZjlist,
+    benchmarkingZjdrill,
+    benchmarkingWtList,
+    benchmarkingDjhxdbbottom,
+    threerateFwjsl,
+    threerateZtzhl,
+    threerateXqjsl,
+    powercompareWindfarmAllAjax,
+    leaderboardLoadfactortoplist,
+    leaderboardTotalPowerCapacityTopList,
+    leaderboardQuerywarningStatistical,
+    specificMaincenterlist,
+    specificMaintoplist,
+    specificFnlylList,
+    specificWhsslList,
+    specificGzsslList,
+    specificXdsslList,
+    specificXnsslList,
+    specificSlsslList,
+    specificMtbfList,
+    specificMttrList,
+    specificFwjslList,
+    specificZtzhlList,
+    specificXqjslList,
+    specificFdlList,
+    specificZhcydlList,
+    powercompareWindfarmAjax,
+    goodnessWindturbinegoodness,
+    powercompareWindturbineAjax,
+    goodnessGoodhistorylist,
+    powercompareWindfarmAjax,
+    goodnessFindWtRealPowerChar,
+    goodnessGetplotBands
 }

src/assets/styles/theme/light/setting.less

@@ -10,4 +10,4 @@
 @darkgray-1 : #7b7d7e;
 @green      : #05bb4c;
 @deepblueBg : 54, 52, 142;
-@gray-2:#dcdddf;
+@gray-2:#dcdddf;

src/router/index.js

@@ -229,6 +229,7 @@ const routes = [{
 		import("../views/Decision/slgl/ztzhl.vue")
 },
 // 三率管理/消缺及时率
+
 {
 	path: "/decision/xqjsl",
 	name: "xqjsl",
@@ -416,6 +417,18 @@ const routes = [{
 		import( /* webpackChunkName: "malfunctionStatistics" */ "../views/malfunctionRecall/index.vue"),
 },
 {
+	path: "/health/gzzd/gzfl", // 故障分类
+	name: "gzfl",
+	component: () =>
+		import( /* webpackChunkName: "malfunctionStatistics" */ "../views/malfunctionDiagnose/gzfl.vue"),
+},
+{
+	path: "/health/gzzd/yjfl", // 预警分类
+	name: "yjfl",
+	component: () =>
+		import( /* webpackChunkName: "malfunctionStatistics" */ "../views/malfunctionDiagnose/yjfl.vue"),
+},
+{
 	path: "/health/frist",
 	name: "health",
 	component: () =>

src/tools/request.js

@@ -16,10 +16,10 @@ service.interceptors.request.use(
 	}
 );
 // 统一格式包装请求参数
-let params = new URLSearchParams();
-for (let key in (options.data || {})) {
-  params.append(key, options.data[key]);
-}
+// let params = new URLSearchParams();
+// for (let key in (options.data || {})) {
+//   params.append(key, options.data[key]);
+// }
 service.interceptors.response.use(
 	// Loading.close(),
 	response => {

src/views/Decision/Decision1.vue

@@ -318,15 +318,18 @@ export default {
   },
   methods: {
     ChangZhanVal() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "/consumer/benchmarking/wplist",
-        success(res) {
-          that.ChangZhan = res.data;
-        },
+      api.benchmarkingWplist({}).then((res) => {
+        this.ChangZhan = res.data;
       });
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "/consumer/benchmarking/wplist",
+      //   success(res) {
+      //     that.ChangZhan = res.data;
+      //   },
+      // });
     },
     ChangZhanChange(val) {
       this.TypeClass = "";
@@ -337,18 +340,24 @@ export default {
       this.XiangMuVal(val);
     },
     XiangMuVal(val) {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "/consumer/benchmarking/projectList",
-        data: {
-          wpids: val,
-        },
-        success(res) {
-          that.XiangMu = res.data;
-        },
+      api.benchmarkingProjectList({
+         wpids: val,
+      }).then((res) => {
+        this.XiangMu = res.data;
       });
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "/consumer/benchmarking/projectList",
+      //   data: {
+      //     wpids: val,
+      //   },
+      //   success(res) {
+      //     that.XiangMu = res.data;
+      //   },
+      // });
     },
     XiangMuChange(val) {
       this.TypeClass = "";
@@ -358,18 +367,24 @@ export default {
       this.XianLuVal(val);
     },
     XianLuVal(val) {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "/consumer/benchmarking/lineList",
-        data: {
-          projects: val,
-        },
-        success(res) {
-          that.XianLu = res.data;
-        },
+      api.benchmarkingLineList({
+         projects: val,
+      }).then((res) => {
+        this.XianLu = res.data;
       });
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "/consumer/benchmarking/lineList",
+      //   data: {
+      //     projects: val,
+      //   },
+      //   success(res) {
+      //     that.XianLu = res.data;
+      //   },
+      // });
     },
     XianLuChange(val) {
       this.TypeClass = "";
@@ -421,7 +436,8 @@ export default {
           type: this.TypeClass,
           target: "",
           sort: "",
-        }).then((res) => {
+        })
+        .then((res) => {
           if (res) {
             var name = [],
               data = [],
@@ -502,7 +518,6 @@ export default {
       //     sort: "",
       //   },
       //   success(res) {
-          
       //     var name = [],
       //       data = [],
       //       llfdl = [],

src/views/Decision/Decision1Mx.vue

@@ -515,133 +515,421 @@
 				let tHeader = []; // 上面设置Excel的表格第一行的标题       
 				let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
 
-				that.tableData.column.forEach(ele => {
-					tHeader.push(ele.name);
-					filterVal.push(ele.field);
-				});
+    //   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;
+    //     },
+    //   });
+    },
+    XiangMuChange(val) {
+      this.TypeClass = "";
+      this.value2 = val;
+      this.value3 = [];
+      this.AjaxCommon();
+      this.XianLuVal(val);
+    },
+    XianLuVal(val) {
+		api.benchmarkingLineList1({
+        projects: val,
+      }).then((res) => {
+        this.XianLu = res.data;
+      });
 
-				var list = [];
-				that.tableData.data.forEach((i, index) => {
-					list.push(i);
-				})
-				list.push(that.tableDataEnd)
-				const data = that.formatJson(filterVal, list);
-				export_json_to_excel(tHeader, data, '导出的Excel'); // 最后一个是表名字
-			},
-		}
-	};
+    //   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;
+    //     },
+    //   });
+    },
+    XianLuChange(val) {
+      this.TypeClass = "";
+      this.value3 = val;
+      this.AjaxCommon();
+    },
+    BeginChange(val) {
+      this.value4 = val;
+      this.AjaxCommon();
+    },
+    EndChange(val) {
+      this.value5 = val;
+      this.AjaxCommon();
+    },
+    TypeClick(val) {
+      this.TypeClass = val;
+      // 重置状态start
+      this.value1 = [];
+      this.value2 = [];
+      this.value3 = [];
+      this.value4 = this.getTime(1);
+      this.value5 = this.getTime(2);
+      this.AjaxCommon();
+      // 重置状态end
+    },
+    getTime(val) {
+      //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+      var date = new Date();
+      var year = date.getFullYear(),
+        month = date.getMonth() + 1,
+        day = date.getDate();
+      month >= 1 && month <= 9 ? (month = "0" + month) : "";
+      day >= 0 && day <= 9 ? (day = "0" + day) : "";
+      var begin = year + "-" + month + "-01";
+      var end = year + "-" + month + "-" + day;
+      if (val == 1) {
+        return begin;
+      } else if (val == 2) {
+        return end;
+      }
+    },
+    AjaxCommon() {
+
+api.benchmarking({
+         wpids: that.value1,
+          projectids: that.value2,
+          lineids: that.value3,
+          beginDate: that.value4,
+          endDate: that.value5,
+          type: that.TypeClass,
+          target: "",
+          sort: "",
+      }).then((res) => {
+          console.log(res);
+          var name = [],
+            data = [],
+            llfdl = [],
+            legend = [
+              "实际电量",
+              "故障损失",
+              "故障受累",
+              "检修受累",
+              "电网受累",
+              "天气受累",
+              "限电降出",
+              "限电停机",
+              "待风损失",
+              "手动停机",
+              "正常发电",
+              "缺陷降出",
+            ],
+            data2 = []; //项目列表
+          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;
+      });
+
+    //   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) {
+    //       console.log(res);
+    //       var name = [],
+    //         data = [],
+    //         llfdl = [],
+    //         legend = [
+    //           "实际电量",
+    //           "故障损失",
+    //           "故障受累",
+    //           "检修受累",
+    //           "电网受累",
+    //           "天气受累",
+    //           "限电降出",
+    //           "限电停机",
+    //           "待风损失",
+    //           "手动停机",
+    //           "正常发电",
+    //           "缺陷降出",
+    //         ],
+    //         data2 = []; //项目列表
+    //       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");
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    exportExcel() {
+      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) => {
+        tHeader.push(ele.name);
+        filterVal.push(ele.field);
+      });
+
+      var list = [];
+      that.tableData.data.forEach((i, index) => {
+        list.push(i);
+      });
+      list.push(that.tableDataEnd);
+      const data = that.formatJson(filterVal, list);
+      export_json_to_excel(tHeader, data, "导出的Excel"); // 最后一个是表名字
+    },
+  },
+};
 </script>
 
 <style lang="less">
-	.contentMx::-webkit-scrollbar {
-		width: 200px;
-		height: 20px;
-	}
+.contentMx::-webkit-scrollbar {
+  width: 200px;
+  height: 20px;
+}
 
-	.contentMx::-webkit-scrollbar-track-piece {
-		background-color: rgba(255, 255, 255, 0.05);
-		-webkit-border-radius: 4px;
-	}
+.contentMx::-webkit-scrollbar-track-piece {
+  background-color: rgba(255, 255, 255, 0.05);
+  -webkit-border-radius: 4px;
+}
 
-	.contentMx::-webkit-scrollbar-thumb {
-		background-color: fade(@gray, 75);
-		-webkit-border-radius: 4px;
-		outline: none;
-		outline-offset: 0px;
-		border: none;
-	}
+.contentMx::-webkit-scrollbar-thumb {
+  background-color: fade(@gray, 75);
+  -webkit-border-radius: 4px;
+  outline: none;
+  outline-offset: 0px;
+  border: none;
+}
 
+.decision-page-1 {
+  .com-panel .panel-title {
+    line-height: 3.4259vh;
+  }
 
-	.decision-page-1 {
-		.com-panel .panel-title {
-			line-height: 3.4259vh;
-		}
+  .tools {
+    display: flex;
+    line-height: 3.4259vh;
 
-		.tools {
-			display: flex;
-			line-height: 3.4259vh;
+    .tool-block {
+      display: flex;
+      align-items: center;
+      margin-left: 0.741vh;
 
-			.tool-block {
-				display: flex;
-				align-items: center;
-				margin-left: 0.741vh;
+      .legend {
+        flex: auto;
+        width: 0.741vh;
+        height: 0.741vh;
+        margin-right: 0.741vh;
 
-				.legend {
-					flex: auto;
-					width: 0.741vh;
-					height: 0.741vh;
-					margin-right: 0.741vh;
+        &.long {
+          width: 2.963vh;
+          height: 0.37vh;
+        }
+      }
 
-					&.long {
-						width: 2.963vh;
-						height: 0.37vh;
-					}
-				}
-
-				.legend-text {
-					color: @gray-l;
-					font-size: @fontsize-s;
-				}
-			}
-		}
+      .legend-text {
+        color: @gray-l;
+        font-size: @fontsize-s;
+      }
+    }
+  }
 
-		.project-table {
-			overflow: auto;
+  .project-table {
+    overflow: auto;
 
-			tbody {
-				height: calc(100vh - 31.5vh);
-			}
+    tbody {
+      height: calc(100vh - 31.5vh);
+    }
 
-			td {
-				color: #b2bdc0;
-			}
-		}
+    td {
+      color: #b2bdc0;
+    }
+  }
 
-		.contentMx {
-			width: 100%;
-			overflow-x: auto;
-		}
+  .contentMx {
+    width: 100%;
+    overflow-x: auto;
+  }
 
-		.activeMx {
-			width: 130%;
-		}
-	}
+  .activeMx {
+    width: 130%;
+  }
+}
 
-	.main {
-		overflow: auto;
-	}
+.main {
+  overflow: auto;
+}
 
-	// .main .main-body{height: calc(100vh - 6.63vh);}
-	.bg-olive {
-		background-color: #8dc63f;
-		color: #ffffff;
-	}
+// .main .main-body{height: calc(100vh - 6.63vh);}
+.bg-olive {
+  background-color: #8dc63f;
+  color: #ffffff;
+}
 
-	.bg-cyan {
-		background-color: #1cbbb4;
-	}
+.bg-cyan {
+  background-color: #1cbbb4;
+}
 
-	.bg-mauve {
-		background-color: #9c26b0;
-	}
+.bg-mauve {
+  background-color: #9c26b0;
+}
 
-	.bg-pink {
-		background-color: #e03997;
-	}
+.bg-pink {
+  background-color: #e03997;
+}
 
-	.bg-brown {
-		background-color: #a5673f;
-	}
+.bg-brown {
+  background-color: #a5673f;
+}
 
-	.bg-pink2 {
-		background-color: #FF0099;
-	}
+.bg-pink2 {
+  background-color: #ff0099;
+}
 
-	.bg-blue2 {
-		background-color: #07ABF5;
-	}
+.bg-blue2 {
+  background-color: #07abf5;
+}
 
-	.bg-green2 {
-		background-color: #1D3638;
-	}
+.bg-green2 {
+  background-color: #1d3638;
+}
 </style>

src/views/Decision/Decision2.vue

@@ -196,6 +196,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import Table from "./table.vue";
 import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 import Dayinfo from "./dayinfo.vue";
+import api from "@api/economic/index.js";
 export default {
   components: {
     Panel,
@@ -441,22 +442,19 @@ export default {
               that.clearDb();
               that.detailShow = 2;
               // var that = this;
-              that.API.requestData({
-                method: "GET",
-                baseURL: "http://10.83.66.220:8020/",
-                subUrl: "benchmarking/details",
-                data: {
+
+              api.benchmarkingDetails({
                   id: dataId,
                   beginDate: that.value4,
                   endDate: that.value5,
                   target: "",
                   sort: "",
-                },
-                success(res) {
-                  var dataTab = [];
+              }).then((res) => {
+             var dataTab = [];
                   res.data.forEach((item, index) => {
                     that.tableIdArr.push(item.id);
 
+                    console.log(this,that)
                     dataTab.push({
                       //表格
                       index: index + 1,
@@ -488,8 +486,57 @@ export default {
                     });
                   });
                   that.tableDataDetail.data = dataTab;
-                },
               });
+
+              // that.API.requestData({
+              //   method: "GET",
+              //   baseURL: "http://10.83.66.220:8020/",
+              //   subUrl: "benchmarking/details",
+              //   data: {
+              //     id: dataId,
+              //     beginDate: that.value4,
+              //     endDate: that.value5,
+              //     target: "",
+              //     sort: "",
+              //   },
+              //   success(res) {
+              //     var dataTab = [];
+              //     res.data.forEach((item, index) => {
+              //       that.tableIdArr.push(item.id);
+
+              //       dataTab.push({
+              //         //表格
+              //         index: index + 1,
+              //         fdl: item.fdl,
+              //         name: item.name,
+              //         zhpm: item.zhpm,
+              //         gzssdl: item.gzssdl,
+              //         jxssdlpm: item.jxssdlpm,
+              //         jxssdl: item.jxssdl,
+              //         xnssdlpm: item.xnssdlpm,
+              //         xnssdl: item.xnssdl,
+              //         xdssdlpm: item.xdssdlpm,
+              //         xdssdl: item.xdssdl,
+              //         slssdlpm: item.slssdlpm,
+              //         slssdl: item.slssdl,
+              //         fnlylpm: item.fnlylpm,
+              //         fnlyl: item.fnlyl,
+              //         gzsslpm: item.gzsslpm,
+              //         gzssl: item.gzssl,
+              //         jxsslpm: item.jxsslpm,
+              //         jxssl: item.jxssl,
+              //         qflpm: item.qflpm,
+              //         qfl: item.qfl,
+              //         xnsslpm: item.xnsslpm,
+              //         xnssl: item.xnssl,
+              //         slsslpm: item.slsslpm,
+              //         slssl: item.slssl,
+              //         is_light: false,
+              //       });
+              //     });
+              //     that.tableDataDetail.data = dataTab;
+              //   },
+              // });
             },
           },
         ],
@@ -723,18 +770,31 @@ 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.value2.push(res.data[0].id);
-          that.ChangZhan = res.data;
+
+      api.benchmarkingWplist2({
+      }).then((res) => {
+         //   that.value2.push(res.data[0].id);
+          this.ChangZhan = res.data;
           //  that.AjaxCommon();
-          that.XiangMuVal(that.value2);
-        },
+          this.XiangMuVal(this.value2);
+          console.log("resCHANzhan:", res.data);
+          console.log("value2:", this.value2);
       });
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/wplist",
+      //   success(res) {
+      //   //   that.value2.push(res.data[0].id);
+      //     that.ChangZhan = res.data;
+      //     //  that.AjaxCommon();
+      //     that.XiangMuVal(that.value2);
+      //     console.log("resCHANzhan:", res.data);
+      //     console.log("value2:", that.value2);
+      //   },
+      // });
     },
     ChangZhanChange(val) {
       this.value1 = val;
@@ -746,18 +806,26 @@ export default {
       this.clearDb();
     },
     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.benchmarkingProjectList2({
+        wpids: val,
+      }).then((res) => {
+       this.XiangMu = res.data;
       });
+
+      // 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;
+      //     console.log("Xiangmu:", res.data);
+      //   },
+      // });
     },
     XiangMuChange(val) {
       this.value2 = val;
@@ -768,18 +836,25 @@ export default {
       this.clearDb();
     },
     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.benchmarkingLineList2({
+         projects: val,
+      }).then((res) => {
+        this.XianLu = res.data;
       });
+
+      // 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;
+      //   },
+      // });
     },
     XianLuChange(val) {
       this.value3 = val;
@@ -813,23 +888,18 @@ export default {
       }
     },
     AjaxCommon() {
-      var that = this;
-      that.API.requestData({
-        //五项损失率
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/wxssl",
-        data: {
-          wpids: that.value1,
-          projectids: that.value2,
-          lineids: that.value3,
-          beginDate: that.value4,
-          endDate: that.value5,
+
+      api.benchmarkingWxssl({
+         wpids: this.value1,
+          projectids: this.value2,
+          lineids: this.value3,
+          beginDate: this.value4,
+          endDate: this.value5,
           target: "",
           sort: "",
-        },
-        success(res) {
-          that.ajaxData = res.data;
+      }).then((res) => {
+         this.ajaxData = res.data;
+          console.log("resData:", res);
           var dataTab = [], //表格
             fdl = [],
             cz = [],
@@ -841,7 +911,7 @@ export default {
             xdssdl = [],
             slssdl = [];
           res.data.forEach((item, index) => {
-            that.tableIdArr.push(item.id);
+            this.tableIdArr.push(item.id);
             dataTab.push({
               //表格
               index: index + 1,
@@ -943,19 +1013,163 @@ export default {
               value: slssdl,
             }
           );
-          that.tableData.data = dataTab;
-          that.innerFdl = fdl;
-          that.outerFdl = fdl;
+          this.tableData.data = dataTab;
+          this.innerFdl = fdl;
+          this.outerFdl = fdl;
 
-          that.innerCz = cz;
-          that.outerCz = cz;
+          this.innerCz = cz;
+          this.outerCz = cz;
 
-          that.innerLl = ll;
-          that.outerLl = ll;
+          this.innerLl = ll;
+          this.outerLl = ll;
 
-          that.analyis = analyis;
-        },
+          this.analyis = analyis;
       });
+
+      // var that = this;
+      // that.API.requestData({
+      //   //五项损失率
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/wxssl",
+      //   data: {
+      //     wpids: that.value1,
+      //     projectids: that.value2,
+      //     lineids: that.value3,
+      //     beginDate: that.value4,
+      //     endDate: that.value5,
+      //     target: "",
+      //     sort: "",
+      //   },
+      //   success(res) {
+      //     that.ajaxData = res.data;
+      //     console.log("resData:", res);
+      //     var dataTab = [], //表格
+      //       fdl = [],
+      //       cz = [],
+      //       ll = [],
+      //       analyis = [],
+      //       gzssdl = [],
+      //       jxssdl = [],
+      //       xnssdl = [],
+      //       xdssdl = [],
+      //       slssdl = [];
+      //     res.data.forEach((item, index) => {
+      //       that.tableIdArr.push(item.id);
+      //       dataTab.push({
+      //         //表格
+      //         index: index + 1,
+      //         name: item.name,
+      //         zhpm: item.zhpm,
+      //         fdlpm: item.fdlpm,
+      //         fdl: item.fdl,
+      //         gzssdlpm: item.gzssdlpm,
+      //         gzssdl: item.gzssdl,
+      //         jxssdlpm: item.jxssdlpm,
+      //         jxssdl: item.jxssdl,
+      //         xnssdlpm: item.xnssdlpm,
+      //         xnssdl: item.xnssdl,
+      //         xdssdlpm: item.xdssdlpm,
+      //         xdssdl: item.xdssdl,
+      //         slssdlpm: item.slssdlpm,
+      //         slssdl: item.slssdl,
+      //         fnlylpm: item.fnlylpm,
+      //         fnlyl: item.fnlyl,
+      //         gzsslpm: item.gzsslpm,
+      //         gzssl: item.gzssl,
+      //         jxsslpm: item.jxsslpm,
+      //         jxssl: item.jxssl,
+      //         qflpm: item.qflpm,
+      //         qfl: item.qfl,
+      //         xnsslpm: item.xnsslpm,
+      //         xnssl: item.xnssl,
+      //         slsslpm: item.slsslpm,
+      //         slssl: item.slssl,
+      //         is_light: false,
+      //       });
+
+      //       fdl.push({
+      //         value: item.fdl,
+      //         name: item.name,
+      //       });
+
+      //       cz.push({
+      //         value: (
+      //           item.gzssdl +
+      //           item.jxssdl +
+      //           item.xnssdl +
+      //           item.xdssdl +
+      //           item.slssdl
+      //         ).toFixed(2),
+      //         name: item.name,
+      //       });
+
+      //       ll.push({
+      //         value: item.llfdl,
+      //         name: item.name,
+      //       });
+
+      //       gzssdl.push({
+      //         text: item.name,
+      //         value: item.gzssdl,
+      //       });
+      //       jxssdl.push({
+      //         text: item.name,
+      //         value: item.jxssdl,
+      //       });
+      //       xnssdl.push({
+      //         text: item.name,
+      //         value: item.xnssdl,
+      //       });
+      //       xdssdl.push({
+      //         text: item.name,
+      //         value: item.xdssdl,
+      //       });
+      //       slssdl.push({
+      //         text: item.name,
+      //         value: item.slssdl,
+      //       });
+      //     });
+      //     analyis.push(
+      //       {
+      //         title: "故障损失电量",
+      //         yAxisIndex: 0,
+      //         value: gzssdl,
+      //       },
+      //       {
+      //         title: "检修损失电量",
+      //         yAxisIndex: 0,
+      //         value: jxssdl,
+      //       },
+      //       {
+      //         title: "性能损失电量",
+      //         yAxisIndex: 0,
+      //         value: xnssdl,
+      //       },
+      //       {
+      //         title: "限电损失电量",
+      //         yAxisIndex: 0,
+      //         value: xdssdl,
+      //       },
+      //       {
+      //         title: "受累损失电量",
+      //         yAxisIndex: 0,
+      //         value: slssdl,
+      //       }
+      //     );
+      //     that.tableData.data = dataTab;
+      //     that.innerFdl = fdl;
+      //     that.outerFdl = fdl;
+
+      //     that.innerCz = cz;
+      //     that.outerCz = cz;
+
+      //     that.innerLl = ll;
+      //     that.outerLl = ll;
+
+      //     that.analyis = analyis;
+      //   },
+      // });
     },
     AjaxDbfx() {
       var that = this;

src/views/Decision/Decision2Cjdb.vue

@@ -147,6 +147,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import Table from "./table.vue";
 import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 import Dayinfo from "./dayinfo.vue";
+import api from "@api/economic/index.js";
 export default {
   components: {
     Panel,
@@ -395,19 +396,15 @@ export default {
               var dataId = that.tableIdArr[data.index - 1];
               that.clearDb();
               that.detailShow = 2;
-              that.API.requestData({
-                method: "GET",
-                baseURL: "http://10.83.66.220:8020/",
-                subUrl: "benchmarking/details",
-                data: {
-                  id: dataId,
+
+              api.benchmarkingDetails({
+        id: dataId,
                   beginDate: that.value4,
                   endDate: that.value5,
                   target: "",
                   sort: "",
-                },
-                success(res) {
-                  var dataTab = [];
+      }).then((res) => {
+                var dataTab = [];
                   res.data.forEach((item, index) => {
                     that.tableIdArr.push(item.id);
                     dataTab.push({
@@ -441,8 +438,56 @@ export default {
                     });
                   });
                   that.tableDataDetail.data = dataTab;
-                },
-              });
+      });
+
+              // that.API.requestData({
+              //   method: "GET",
+              //   baseURL: "http://10.83.66.220:8020/",
+              //   subUrl: "benchmarking/details",
+              //   data: {
+              //     id: dataId,
+              //     beginDate: that.value4,
+              //     endDate: that.value5,
+              //     target: "",
+              //     sort: "",
+              //   },
+              //   success(res) {
+              //     var dataTab = [];
+              //     res.data.forEach((item, index) => {
+              //       that.tableIdArr.push(item.id);
+              //       dataTab.push({
+              //         //表格
+              //         index: index + 1,
+              //         fdl: item.fdl,
+              //         name: item.name,
+              //         zhpm: item.zhpm,
+              //         gzssdl: item.gzssdl,
+              //         jxssdlpm: item.jxssdlpm,
+              //         jxssdl: item.jxssdl,
+              //         xnssdlpm: item.xnssdlpm,
+              //         xnssdl: item.xnssdl,
+              //         xdssdlpm: item.xdssdlpm,
+              //         xdssdl: item.xdssdl,
+              //         slssdlpm: item.slssdlpm,
+              //         slssdl: item.slssdl,
+              //         fnlylpm: item.fnlylpm,
+              //         fnlyl: item.fnlyl,
+              //         gzsslpm: item.gzsslpm,
+              //         gzssl: item.gzssl,
+              //         jxsslpm: item.jxsslpm,
+              //         jxssl: item.jxssl,
+              //         qflpm: item.qflpm,
+              //         qfl: item.qfl,
+              //         xnsslpm: item.xnsslpm,
+              //         xnssl: item.xnssl,
+              //         slsslpm: item.slsslpm,
+              //         slssl: item.slssl,
+              //         is_light: false,
+              //       });
+              //     });
+              //     that.tableDataDetail.data = dataTab;
+              //   },
+              // });
             },
           },
         ],
@@ -668,15 +713,24 @@ 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.benchmarkingWplist2({
+        
+      }).then((res) => {
+        this.ChangZhan = res.data;
       });
+
+
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/wplist",
+      //   success(res) {
+      //     that.ChangZhan = res.data;
+      //   },
+      // });
     },
     ChangZhanChange(val) {
       this.value1 = val;
@@ -710,23 +764,17 @@ export default {
       }
     },
     AjaxCommon() {
-      var that = this;
-      that.API.requestData({
-        //五项损失率
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/cjdb",
-        data: {
-          wpids: that.value1,
-          projectids: that.value2,
-          lineids: that.value3,
-          beginDate: that.value4,
-          endDate: that.value5,
+
+api.benchmarkingCjdb({
+          wpids: this.value1,
+          projectids: this.value2,
+          lineids: this.value3,
+          beginDate: this.value4,
+          endDate: this.value5,
           target: "",
           sort: "",
-        },
-        success(res) {
-          that.ajaxData = res.data;
+      }).then((res) => {
+         this.ajaxData = res.data;
           var dataTab = [], //表格
             fdl = [],
             cz = [],
@@ -738,7 +786,7 @@ export default {
             xdssdl = [],
             slssdl = [];
           res.data.forEach((item, index) => {
-            that.tableIdArr.push(item.id);
+            this.tableIdArr.push(item.id);
             dataTab.push({
               //表格
               index: index + 1,
@@ -835,17 +883,155 @@ export default {
               value: slssdl,
             }
           );
-          that.tableData.data = dataTab;
+          this.tableData.data = dataTab;
 
-          that.innerFdl = fdl;
-          that.outerFdl = fdl;
+          this.innerFdl = fdl;
+          this.outerFdl = fdl;
 
-          that.innerCz = cz;
-          that.outerCz = cz;
+          this.innerCz = cz;
+          this.outerCz = cz;
 
-          that.analyis = analyis;
-        },
+          this.analyis = analyis;
       });
+
+
+
+      // var that = this;
+      // that.API.requestData({
+      //   //五项损失率
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/cjdb",
+      //   data: {
+      //     wpids: that.value1,
+      //     projectids: that.value2,
+      //     lineids: that.value3,
+      //     beginDate: that.value4,
+      //     endDate: that.value5,
+      //     target: "",
+      //     sort: "",
+      //   },
+      //   success(res) {
+      //     that.ajaxData = res.data;
+      //     var dataTab = [], //表格
+      //       fdl = [],
+      //       cz = [],
+      //       ll = [],
+      //       analyis = [],
+      //       gzssdl = [],
+      //       jxssdl = [],
+      //       xnssdl = [],
+      //       xdssdl = [],
+      //       slssdl = [];
+      //     res.data.forEach((item, index) => {
+      //       that.tableIdArr.push(item.id);
+      //       dataTab.push({
+      //         //表格
+      //         index: index + 1,
+      //         fdl: item.fdl,
+      //         name: item.name,
+      //         zhpm: item.zhpm,
+      //         fdlpm: item.fdlpm,
+      //         gzssdlpm: item.gzssdlpm,
+      //         gzssdl: item.gzssdl,
+      //         jxssdlpm: item.jxssdlpm,
+      //         jxssdl: item.jxssdl,
+      //         xnssdlpm: item.xnssdlpm,
+      //         xnssdl: item.xnssdl,
+      //         xdssdlpm: item.xdssdlpm,
+      //         xdssdl: item.xdssdl,
+      //         slssdlpm: item.slssdlpm,
+      //         slssdl: item.slssdl,
+      //         fnlylpm: item.fnlylpm,
+      //         fnlyl: item.fnlyl,
+      //         gzsslpm: item.gzsslpm,
+      //         gzssl: item.gzssl,
+      //         jxsslpm: item.jxsslpm,
+      //         jxssl: item.jxssl,
+      //         qflpm: item.qflpm,
+      //         qfl: item.qfl,
+      //         xnsslpm: item.xnsslpm,
+      //         xnssl: item.xnssl,
+      //         slsslpm: item.slsslpm,
+      //         slssl: item.slssl,
+      //         is_light: false,
+      //       });
+
+      //       fdl.push({
+      //         value: item.fdl,
+      //         name: item.name,
+      //       });
+
+      //       cz.push({
+      //         value: (
+      //           item.gzssdl +
+      //           item.jxssdl +
+      //           item.xnssdl +
+      //           item.xdssdl +
+      //           item.slssdl
+      //         ).toFixed(2),
+      //         name: item.name,
+      //       });
+
+      //       gzssdl.push({
+      //         text: item.name,
+      //         value: item.gzssdl,
+      //       });
+      //       jxssdl.push({
+      //         text: item.name,
+      //         value: item.jxssdl,
+      //       });
+      //       xnssdl.push({
+      //         text: item.name,
+      //         value: item.xnssdl,
+      //       });
+      //       xdssdl.push({
+      //         text: item.name,
+      //         value: item.xdssdl,
+      //       });
+      //       slssdl.push({
+      //         text: item.name,
+      //         value: item.slssdl,
+      //       });
+      //     });
+      //     analyis.push(
+      //       {
+      //         title: "故障损失电量",
+      //         yAxisIndex: 0,
+      //         value: gzssdl,
+      //       },
+      //       {
+      //         title: "检修损失电量",
+      //         yAxisIndex: 0,
+      //         value: jxssdl,
+      //       },
+      //       {
+      //         title: "性能损失电量",
+      //         yAxisIndex: 0,
+      //         value: xnssdl,
+      //       },
+      //       {
+      //         title: "限电损失电量",
+      //         yAxisIndex: 0,
+      //         value: xdssdl,
+      //       },
+      //       {
+      //         title: "受累损失电量",
+      //         yAxisIndex: 0,
+      //         value: slssdl,
+      //       }
+      //     );
+      //     that.tableData.data = dataTab;
+
+      //     that.innerFdl = fdl;
+      //     that.outerFdl = fdl;
+
+      //     that.innerCz = cz;
+      //     that.outerCz = cz;
+
+      //     that.analyis = analyis;
+      //   },
+      // });
     },
     AjaxDbfx() {
       var that = this;

src/views/Decision/Decision2Cndb.vue

@@ -129,6 +129,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import Table from "./table.vue";
 import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 import Dayinfo from "./dayinfo.vue";
+import api from "@api/economic/index.js";
 export default {
   components: {
     Panel,
@@ -373,19 +374,16 @@ export default {
               var dataId = that.tableIdArr[data.index - 1];
               that.clearDb();
               that.detailShow = 2;
-              // var that = this;
-              that.API.requestData({
-                method: "GET",
-                baseURL: "http://10.83.66.220:8020/",
-                subUrl: "benchmarking/details",
-                data: {
+
+              api
+                .benchmarkingDetails({
                   id: dataId,
                   beginDate: that.value4,
                   endDate: that.value5,
                   target: "",
                   sort: "",
-                },
-                success(res) {
+                })
+                .then((res) => {
                   var dataTab = [];
                   res.data.forEach((item, index) => {
                     that.tableIdArr.push(item.date);
@@ -419,8 +417,56 @@ export default {
                     });
                   });
                   that.tableDataDetail.data = dataTab;
-                },
-              });
+                });
+
+              // var that = this;    benchmarkingDetails
+              // that.API.requestData({
+              //   method: "GET",
+              //   baseURL: "http://10.83.66.220:8020/",
+              //   subUrl: "benchmarking/details",
+              //   data: {
+              //     id: dataId,
+              //     beginDate: that.value4,
+              //     endDate: that.value5,
+              //     target: "",
+              //     sort: "",
+              //   },
+              //   success(res) {
+              //     var dataTab = [];
+              //     res.data.forEach((item, index) => {
+              //       that.tableIdArr.push(item.date);
+
+              //       dataTab.push({
+              //         //表格
+              //         index: index + 1,
+              //         fdl: item.fdl,
+              //         name: item.name,
+              //         zhpm: item.zhpm,
+              //         gzssdl: item.gzssdl,
+              //         jxssdlpm: item.jxssdlpm,
+              //         jxssdl: item.jxssdl,
+              //         xnssdlpm: item.xnssdlpm,
+              //         xnssdl: item.xnssdl,
+              //         xdssdlpm: item.xdssdlpm,
+              //         xdssdl: item.xdssdl,
+              //         slssdlpm: item.slssdlpm,
+              //         slssdl: item.slssdl,
+              //         gzsslpm: item.gzsslpm,
+              //         gzssl: item.gzssl,
+              //         jxsslpm: item.jxsslpm,
+              //         jxssl: item.jxssl,
+              //         qflpm: item.qflpm,
+              //         qfl: item.qfl,
+              //         xnsslpm: item.xnsslpm,
+              //         xnssl: item.xnssl,
+              //         slsslpm: item.slsslpm,
+              //         slssl: item.slssl,
+              //         is_light: false,
+              //       });
+              //     });
+              //     that.tableDataDetail.data = dataTab;
+              //   },
+              // });
             },
           },
         ],
@@ -644,15 +690,24 @@ 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.benchmarkingWplist2({
+       
+      }).then((res) => {
+        this.ChangZhan = res.data;
       });
+
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/wplist",
+      //   success(res) {
+      //     that.ChangZhan = res.data;
+      //   },
+      // });
     },
     ChangZhanChange(val) {
       this.value1 = val;
@@ -686,20 +741,15 @@ export default {
       }
     },
     AjaxCommon() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/cndb",
-        data: {
-          wpid: that.value1,
-          beginDate: that.value4,
-          endDate: that.value5,
+
+api.benchmarkingCndb({
+         wpid: this.value1,
+          beginDate: this.value4,
+          endDate: this.value5,
           target: "",
           sort: "",
-        },
-        success(res) {
-          that.ajaxData = res.data;
+      }).then((res) => {
+         this.ajaxData = res.data;
           var dataTab = [], //表格
             analyis = [],
             gzssdl = [],
@@ -708,7 +758,7 @@ export default {
             xdssdl = [],
             slssdl = [];
           res.data.forEach((item, index) => {
-            that.tableIdArr.push(item.date);
+            this.tableIdArr.push(item.date);
             dataTab.push({
               //表格
               index: index + 1,
@@ -790,11 +840,121 @@ export default {
               value: slssdl,
             }
           );
-          that.tableData.data = dataTab;
+          this.tableData.data = dataTab;
 
-          that.analyis = analyis;
-        },
+          this.analyis = analyis;
       });
+
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/cndb",
+      //   data: {
+      //     wpid: that.value1,
+      //     beginDate: that.value4,
+      //     endDate: that.value5,
+      //     target: "",
+      //     sort: "",
+      //   },
+      //   success(res) {
+      //     that.ajaxData = res.data;
+      //     var dataTab = [], //表格
+      //       analyis = [],
+      //       gzssdl = [],
+      //       jxssdl = [],
+      //       xnssdl = [],
+      //       xdssdl = [],
+      //       slssdl = [];
+      //     res.data.forEach((item, index) => {
+      //       that.tableIdArr.push(item.date);
+      //       dataTab.push({
+      //         //表格
+      //         index: index + 1,
+      //         zhpm: item.zhpm,
+      //         date: item.date.substr(0, 10),
+      //         fdlpm: item.fdlpm,
+      //         fdl: item.fdl,
+      //         gzssdlpm: item.gzssdlpm,
+      //         gzssdl: item.gzssdl,
+      //         jxssdlpm: item.jxssdlpm,
+      //         jxssdl: item.jxssdl,
+      //         xnssdlpm: item.xnssdlpm,
+      //         xnssdl: item.xnssdl,
+      //         xdssdlpm: item.xdssdlpm,
+      //         xdssdl: item.xdssdl,
+      //         slssdlpm: item.slssdlpm,
+      //         slssdl: item.slssdl,
+      //         fnlylpm: item.fnlylpm,
+      //         fnlyl: item.fnlyl,
+      //         gzsslpm: item.gzsslpm,
+      //         gzssl: item.gzssl,
+      //         jxsslpm: item.jxsslpm,
+      //         jxssl: item.jxssl,
+      //         qflpm: item.qflpm,
+      //         qfl: item.qfl,
+      //         xnsslpm: item.xnsslpm,
+      //         xnssl: item.xnssl,
+      //         slsslpm: item.slsslpm,
+      //         slssl: item.slssl,
+      //         is_light: false,
+      //       });
+      //       if (index < 7) {
+      //         gzssdl.push({
+      //           text: item.date.substr(0, 10),
+      //           value: item.gzssdl,
+      //         });
+      //         jxssdl.push({
+      //           text: item.date.substr(0, 10),
+      //           value: item.jxssdl,
+      //         });
+      //         xnssdl.push({
+      //           text: item.date.substr(0, 10),
+      //           value: item.xnssdl,
+      //         });
+      //         xdssdl.push({
+      //           text: item.date.substr(0, 10),
+      //           value: item.xdssdl,
+      //         });
+      //         slssdl.push({
+      //           text: item.date.substr(0, 10),
+      //           value: item.slssdl,
+      //         });
+      //       }
+      //     });
+      //     analyis.push(
+      //       {
+      //         title: "故障损失电量",
+      //         yAxisIndex: 0,
+      //         value: gzssdl,
+      //       },
+      //       {
+      //         title: "检修损失电量",
+      //         yAxisIndex: 0,
+      //         value: jxssdl,
+      //       },
+      //       {
+      //         title: "性能损失电量",
+      //         yAxisIndex: 0,
+      //         value: xnssdl,
+      //       },
+      //       {
+      //         title: "限电损失电量",
+      //         yAxisIndex: 0,
+      //         value: xdssdl,
+      //       },
+      //       {
+      //         title: "受累损失电量",
+      //         yAxisIndex: 0,
+      //         value: slssdl,
+      //       }
+      //     );
+      //     that.tableData.data = dataTab;
+
+      //     that.analyis = analyis;
+      //   },
+      // });
     },
     AjaxDbfx() {
       var that = this;

src/views/Decision/Decision2Xldb.vue

@@ -178,6 +178,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import Table from "./table.vue";
 import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 import Dayinfo from "./dayinfo.vue";
+import api from "@api/economic/index.js";
 export default {
   components: {
     Panel,
@@ -429,18 +430,16 @@ export default {
               var dataId = that.tableIdArr[data.index - 1];
               that.clearDb();
               that.detailShow = 2;
-              that.API.requestData({
-                method: "GET",
-                baseURL: "http://10.83.66.220:8020/",
-                subUrl: "benchmarking/details",
-                data: {
+
+              api
+                .benchmarkingDetails({
                   id: dataId,
                   beginDate: that.value4,
                   endDate: that.value5,
                   target: "",
                   sort: "",
-                },
-                success(res) {
+                })
+                .then((res) => {
                   var dataTab = [];
                   res.data.forEach((item, index) => {
                     that.tableIdArr.push(item.id);
@@ -476,8 +475,57 @@ export default {
                     });
                   });
                   that.tableDataDetail.data = dataTab;
-                },
-              });
+                });
+
+              // that.API.requestData({
+              //   method: "GET",
+              //   baseURL: "http://10.83.66.220:8020/",
+              //   subUrl: "benchmarking/details",
+              //   data: {
+              //     id: dataId,
+              //     beginDate: that.value4,
+              //     endDate: that.value5,
+              //     target: "",
+              //     sort: "",
+              //   },
+              //   success(res) {
+              //     var dataTab = [];
+              //     res.data.forEach((item, index) => {
+              //       that.tableIdArr.push(item.id);
+
+              //       dataTab.push({
+              //         //表格
+              //         index: index + 1,
+              //         fdl: item.fdl,
+              //         name: item.name,
+              //         zhpm: item.zhpm,
+              //         gzssdl: item.gzssdl,
+              //         jxssdlpm: item.jxssdlpm,
+              //         jxssdl: item.jxssdl,
+              //         xnssdlpm: item.xnssdlpm,
+              //         xnssdl: item.xnssdl,
+              //         xdssdlpm: item.xdssdlpm,
+              //         xdssdl: item.xdssdl,
+              //         slssdlpm: item.slssdlpm,
+              //         slssdl: item.slssdl,
+              //         fnlylpm: item.fnlylpm,
+              //         fnlyl: item.fnlyl,
+              //         gzsslpm: item.gzsslpm,
+              //         gzssl: item.gzssl,
+              //         jxsslpm: item.jxsslpm,
+              //         jxssl: item.jxssl,
+              //         qflpm: item.qflpm,
+              //         qfl: item.qfl,
+              //         xnsslpm: item.xnsslpm,
+              //         xnssl: item.xnssl,
+              //         slsslpm: item.slsslpm,
+              //         slssl: item.slssl,
+              //         is_light: false,
+              //       });
+              //     });
+              //     that.tableDataDetail.data = dataTab;
+              //   },
+              // });
             },
           },
         ],
@@ -702,32 +750,43 @@ export default {
     };
   },
   created() {
-    var that = this;
+    // var that = this;
     this.ChangZhanVal();
     this.value4 = this.getTime(1);
     this.value5 = this.getTime(2);
-    that.API.requestData({
-      method: "GET",
-      baseURL: "http://10.83.66.220:8020/",
-      subUrl: "benchmarking/wplist",
-      success(res) {
-        that.value1.push(res.data[0].id);
-        that.AjaxCommon();
-      },
+
+    api.benchmarkingWplist1({}).then((res) => {
+      this.value1.push(res.data[0].id);
+      this.AjaxCommon();
     });
+
+    // that.API.requestData({
+    //   method: "GET",
+    //   baseURL: "http://10.83.66.220:8020/",
+    //   subUrl: "benchmarking/wplist",
+    //   success(res) {
+    //     that.value1.push(res.data[0].id);
+    //     that.AjaxCommon();
+    //   },
+    // });
   },
   methods: {
     ChangZhanVal() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/wplist",
-        success(res) {
-          that.oneData = res.data[0].id;
-          that.ChangZhan = res.data;
-        },
+      api.benchmarkingWplist1({}).then((res) => {
+        this.oneData = res.data[0].id;
+        this.ChangZhan = res.data;
       });
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/wplist",
+      //   success(res) {
+      //     that.oneData = res.data[0].id;
+      //     that.ChangZhan = res.data;
+      //   },
+      // });
     },
     ChangZhanChange(val) {
       console.log(val);
@@ -739,18 +798,26 @@ export default {
       this.clearDb();
     },
     XiangMuVal(val) {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/projectList",
-        data: {
+      api
+        .benchmarkingProjectList1({
           wpids: val,
-        },
-        success(res) {
-          that.XiangMu = res.data;
-        },
-      });
+        })
+        .then((res) => {
+          this.XiangMu = res.data;
+        });
+
+      // 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;
+      //   },
+      // });
     },
     XiangMuChange(val) {
       this.value2 = val;
@@ -760,18 +827,27 @@ export default {
       this.clearDb();
     },
     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.benchmarkingLineList2({
+        projects: val,
+      }).then((res) => {
+        this.XianLu = res.data;
       });
+
+
+
+      // 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;
+      //   },
+      // });
     },
     XianLuChange(val) {
       this.value3 = val;
@@ -805,24 +881,17 @@ export default {
       }
     },
     AjaxCommon() {
-      var that = this;
-      console.log(JSON.stringify(that.value1));
-      that.API.requestData({
-        //五项损失率
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/xldb",
-        data: {
-          wpids: that.value1,
-          projectids: that.value2,
-          lineids: that.value3,
-          beginDate: that.value4,
-          endDate: that.value5,
+
+      api.benchmarkingXldb({
+        wpids: this.value1,
+          projectids: this.value2,
+          lineids: this.value3,
+          beginDate: this.value4,
+          endDate: this.value5,
           target: "",
           sort: "",
-        },
-        success(res) {
-          that.ajaxData = res.data;
+      }).then((res) => {
+         this.ajaxData = res.data;
           var dataTab = [], //表格
             fdl = [],
             cz = [],
@@ -834,7 +903,7 @@ export default {
             xdssdl = [],
             slssdl = [];
           res.data.forEach((item, index) => {
-            that.tableIdArr.push(item.id);
+            this.tableIdArr.push(item.id);
             dataTab.push({
               //表格
               index: index + 1,
@@ -936,20 +1005,165 @@ export default {
               value: slssdl,
             }
           );
-          that.tableData.data = dataTab;
+          this.tableData.data = dataTab;
 
-          that.innerFdl = fdl;
-          that.outerFdl = fdl;
+          this.innerFdl = fdl;
+          this.outerFdl = fdl;
 
-          that.innerCz = cz;
-          that.outerCz = cz;
+          this.innerCz = cz;
+          this.outerCz = cz;
 
-          that.innerLl = ll;
-          that.outerLl = ll;
+          this.innerLl = ll;
+          this.outerLl = ll;
 
-          that.analyis = analyis;
-        },
+          this.analyis = analyis;
       });
+
+
+      // var that = this;
+      // that.API.requestData({
+      //   //五项损失率
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/xldb",
+      //   data: {
+      //     wpids: that.value1,
+      //     projectids: that.value2,
+      //     lineids: that.value3,
+      //     beginDate: that.value4,
+      //     endDate: that.value5,
+      //     target: "",
+      //     sort: "",
+      //   },
+      //   success(res) {
+      //     that.ajaxData = res.data;
+      //     var dataTab = [], //表格
+      //       fdl = [],
+      //       cz = [],
+      //       ll = [],
+      //       analyis = [],
+      //       gzssdl = [],
+      //       jxssdl = [],
+      //       xnssdl = [],
+      //       xdssdl = [],
+      //       slssdl = [];
+      //     res.data.forEach((item, index) => {
+      //       that.tableIdArr.push(item.id);
+      //       dataTab.push({
+      //         //表格
+      //         index: index + 1,
+      //         name: item.name,
+      //         zhpm: item.zhpm,
+      //         fdlpm: item.fdlpm,
+      //         fdl: item.fdl,
+      //         gzssdlpm: item.gzssdlpm,
+      //         gzssdl: item.gzssdl,
+      //         jxssdlpm: item.jxssdlpm,
+      //         jxssdl: item.jxssdl,
+      //         xnssdlpm: item.xnssdlpm,
+      //         xnssdl: item.xnssdl,
+      //         xdssdlpm: item.xdssdlpm,
+      //         xdssdl: item.xdssdl,
+      //         slssdlpm: item.slssdlpm,
+      //         slssdl: item.slssdl,
+      //         fnlylpm: item.fnlylpm,
+      //         fnlyl: item.fnlyl,
+      //         gzsslpm: item.gzsslpm,
+      //         gzssl: item.gzssl,
+      //         jxsslpm: item.jxsslpm,
+      //         jxssl: item.jxssl,
+      //         qflpm: item.qflpm,
+      //         qfl: item.qfl,
+      //         xnsslpm: item.xnsslpm,
+      //         xnssl: item.xnssl,
+      //         slsslpm: item.slsslpm,
+      //         slssl: item.slssl,
+      //         is_light: false,
+      //       });
+
+      //       fdl.push({
+      //         value: item.fdl,
+      //         name: item.name,
+      //       });
+
+      //       cz.push({
+      //         value: (
+      //           item.gzssdl +
+      //           item.jxssdl +
+      //           item.xnssdl +
+      //           item.xdssdl +
+      //           item.slssdl
+      //         ).toFixed(2),
+      //         name: item.name,
+      //       });
+
+      //       ll.push({
+      //         value: item.llfdl,
+      //         name: item.name,
+      //       });
+
+      //       gzssdl.push({
+      //         text: item.name,
+      //         value: item.gzssdl,
+      //       });
+      //       jxssdl.push({
+      //         text: item.name,
+      //         value: item.jxssdl,
+      //       });
+      //       xnssdl.push({
+      //         text: item.name,
+      //         value: item.xnssdl,
+      //       });
+      //       xdssdl.push({
+      //         text: item.name,
+      //         value: item.xdssdl,
+      //       });
+      //       slssdl.push({
+      //         text: item.name,
+      //         value: item.slssdl,
+      //       });
+      //     });
+      //     analyis.push(
+      //       {
+      //         title: "故障损失电量",
+      //         yAxisIndex: 0,
+      //         value: gzssdl,
+      //       },
+      //       {
+      //         title: "检修损失电量",
+      //         yAxisIndex: 0,
+      //         value: jxssdl,
+      //       },
+      //       {
+      //         title: "性能损失电量",
+      //         yAxisIndex: 0,
+      //         value: xnssdl,
+      //       },
+      //       {
+      //         title: "限电损失电量",
+      //         yAxisIndex: 0,
+      //         value: xdssdl,
+      //       },
+      //       {
+      //         title: "受累损失电量",
+      //         yAxisIndex: 0,
+      //         value: slssdl,
+      //       }
+      //     );
+      //     that.tableData.data = dataTab;
+
+      //     that.innerFdl = fdl;
+      //     that.outerFdl = fdl;
+
+      //     that.innerCz = cz;
+      //     that.outerCz = cz;
+
+      //     that.innerLl = ll;
+      //     that.outerLl = ll;
+
+      //     that.analyis = analyis;
+      //   },
+      // });
     },
     AjaxDbfx() {
       var that = this;

src/views/Decision/Decision2Xmdb.vue

@@ -158,6 +158,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import Table from "../../components/coms/table/table.vue";
 import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 import Dayinfo from "./dayinfo.vue";
+import api from "@api/economic/index.js";
 export default {
   components: {
     Panel,
@@ -407,18 +408,16 @@ export default {
               that.clearDb();
               that.detailShow = 2;
               // var that = this;
-              that.API.requestData({
-                method: "GET",
-                baseURL: "http://10.83.66.220:8020/",
-                subUrl: "benchmarking/details",
-                data: {
+
+              api
+                .benchmarkingDetails({
                   id: dataId,
                   beginDate: that.value4,
                   endDate: that.value5,
                   target: "",
                   sort: "",
-                },
-                success(res) {
+                })
+                .then((res) => {
                   var dataTab = [];
                   res.data.forEach((item, index) => {
                     that.tableIdArr.push(item.id);
@@ -453,8 +452,56 @@ export default {
                     });
                   });
                   that.tableDataDetail.data = dataTab;
-                },
-              });
+                });
+
+              // that.API.requestData({
+              //   method: "GET",
+              //   baseURL: "http://10.83.66.220:8020/",
+              //   subUrl: "benchmarking/details",
+              //   data: {
+              //     id: dataId,
+              //     beginDate: that.value4,
+              //     endDate: that.value5,
+              //     target: "",
+              //     sort: "",
+              //   },
+              //   success(res) {
+              //     var dataTab = [];
+              //     res.data.forEach((item, index) => {
+              //       that.tableIdArr.push(item.id);
+
+              //       dataTab.push({
+              //         //表格
+              //         index: index + 1,
+              //         name: item.name,
+              //         zhpm: item.zhpm,
+              //         gzssdl: item.gzssdl,
+              //         jxssdlpm: item.jxssdlpm,
+              //         jxssdl: item.jxssdl,
+              //         xnssdlpm: item.xnssdlpm,
+              //         xnssdl: item.xnssdl,
+              //         xdssdlpm: item.xdssdlpm,
+              //         xdssdl: item.xdssdl,
+              //         slssdlpm: item.slssdlpm,
+              //         slssdl: item.slssdl,
+              //         fnlylpm: item.fnlylpm,
+              //         fnlyl: item.fnlyl,
+              //         gzsslpm: item.gzsslpm,
+              //         gzssl: item.gzssl,
+              //         jxsslpm: item.jxsslpm,
+              //         jxssl: item.jxssl,
+              //         qflpm: item.qflpm,
+              //         qfl: item.qfl,
+              //         xnsslpm: item.xnsslpm,
+              //         xnssl: item.xnssl,
+              //         slsslpm: item.slsslpm,
+              //         slssl: item.slssl,
+              //         is_light: false,
+              //       });
+              //     });
+              //     that.tableDataDetail.data = dataTab;
+              //   },
+              // });
             },
           },
         ],
@@ -677,16 +724,21 @@ 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;
-          that.AjaxCommon();
-        },
+      api.benchmarkingWplist2({}).then((res) => {
+        this.ChangZhan = res.data;
+        this.AjaxCommon();
       });
+
+      // 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.AjaxCommon();
+      //   },
+      // });
     },
     ChangZhanChange(val) {
       this.value1 = val;
@@ -696,18 +748,26 @@ export default {
       this.clearDb();
     },
     XiangMuVal(val) {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/projectList",
-        data: {
+      api
+        .benchmarkingProjectList2({
           wpids: val,
-        },
-        success(res) {
-          that.XiangMu = res.data;
-        },
-      });
+        })
+        .then((res) => {
+          this.XiangMu = res.data;
+        });
+
+      // 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;
+      //   },
+      // });
     },
     XiangMuChange(val) {
       this.value2 = val;
@@ -741,22 +801,16 @@ export default {
       }
     },
     AjaxCommon() {
-      var that = this;
-      that.API.requestData({
-        //五项损失率
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/xmdb",
-        data: {
-          wpids: that.value1,
-          projectids: that.value2,
-          beginDate: that.value4,
-          endDate: that.value5,
+
+      api.benchmarkingXmdb({
+         wpids: this.value1,
+          projectids: this.value2,
+          beginDate: this.value4,
+          endDate: this.value5,
           target: "",
           sort: "",
-        },
-        success(res) {
-          that.ajaxData = res.data;
+      }).then((res) => {
+         this.ajaxData = res.data;
           var dataTab = [], //表格
             fdl = [],
             cz = [],
@@ -768,7 +822,7 @@ export default {
             xdssdl = [],
             slssdl = [];
           res.data.forEach((item, index) => {
-            that.tableIdArr.push(item.id);
+            this.tableIdArr.push(item.id);
             dataTab.push({
               //表格
               index: index + 1,
@@ -870,20 +924,164 @@ export default {
               value: slssdl,
             }
           );
-          that.tableData.data = dataTab;
+          this.tableData.data = dataTab;
 
-          that.innerFdl = fdl;
-          that.outerFdl = fdl;
+          this.innerFdl = fdl;
+          this.outerFdl = fdl;
 
-          that.innerCz = cz;
-          that.outerCz = cz;
+          this.innerCz = cz;
+          this.outerCz = cz;
 
-          that.innerLl = ll;
-          that.outerLl = ll;
+          this.innerLl = ll;
+          this.outerLl = ll;
 
-          that.analyis = analyis;
-        },
+          this.analyis = analyis;
       });
+
+
+      // var that = this;
+      // that.API.requestData({
+      //   //五项损失率
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/xmdb",
+      //   data: {
+      //     wpids: that.value1,
+      //     projectids: that.value2,
+      //     beginDate: that.value4,
+      //     endDate: that.value5,
+      //     target: "",
+      //     sort: "",
+      //   },
+      //   success(res) {
+      //     that.ajaxData = res.data;
+      //     var dataTab = [], //表格
+      //       fdl = [],
+      //       cz = [],
+      //       ll = [],
+      //       analyis = [],
+      //       gzssdl = [],
+      //       jxssdl = [],
+      //       xnssdl = [],
+      //       xdssdl = [],
+      //       slssdl = [];
+      //     res.data.forEach((item, index) => {
+      //       that.tableIdArr.push(item.id);
+      //       dataTab.push({
+      //         //表格
+      //         index: index + 1,
+      //         name: item.name,
+      //         zhpm: item.zhpm,
+      //         fdlpm: item.fdlpm,
+      //         fdl: item.fdl,
+      //         gzssdlpm: item.gzssdlpm,
+      //         gzssdl: item.gzssdl,
+      //         jxssdlpm: item.jxssdlpm,
+      //         jxssdl: item.jxssdl,
+      //         xnssdlpm: item.xnssdlpm,
+      //         xnssdl: item.xnssdl,
+      //         xdssdlpm: item.xdssdlpm,
+      //         xdssdl: item.xdssdl,
+      //         slssdlpm: item.slssdlpm,
+      //         slssdl: item.slssdl,
+      //         fnlylpm: item.fnlylpm,
+      //         fnlyl: item.fnlyl,
+      //         gzsslpm: item.gzsslpm,
+      //         gzssl: item.gzssl,
+      //         jxsslpm: item.jxsslpm,
+      //         jxssl: item.jxssl,
+      //         qflpm: item.qflpm,
+      //         qfl: item.qfl,
+      //         xnsslpm: item.xnsslpm,
+      //         xnssl: item.xnssl,
+      //         slsslpm: item.slsslpm,
+      //         slssl: item.slssl,
+      //         is_light: false,
+      //       });
+
+      //       fdl.push({
+      //         value: item.fdl,
+      //         name: item.name,
+      //       });
+
+      //       cz.push({
+      //         value: (
+      //           item.gzssdl +
+      //           item.jxssdl +
+      //           item.xnssdl +
+      //           item.xdssdl +
+      //           item.slssdl
+      //         ).toFixed(2),
+      //         name: item.name,
+      //       });
+
+      //       ll.push({
+      //         value: item.llfdl,
+      //         name: item.name,
+      //       });
+
+      //       gzssdl.push({
+      //         text: item.name,
+      //         value: item.gzssdl,
+      //       });
+      //       jxssdl.push({
+      //         text: item.name,
+      //         value: item.jxssdl,
+      //       });
+      //       xnssdl.push({
+      //         text: item.name,
+      //         value: item.xnssdl,
+      //       });
+      //       xdssdl.push({
+      //         text: item.name,
+      //         value: item.xdssdl,
+      //       });
+      //       slssdl.push({
+      //         text: item.name,
+      //         value: item.slssdl,
+      //       });
+      //     });
+      //     analyis.push(
+      //       {
+      //         title: "故障损失电量",
+      //         yAxisIndex: 0,
+      //         value: gzssdl,
+      //       },
+      //       {
+      //         title: "检修损失电量",
+      //         yAxisIndex: 0,
+      //         value: jxssdl,
+      //       },
+      //       {
+      //         title: "性能损失电量",
+      //         yAxisIndex: 0,
+      //         value: xnssdl,
+      //       },
+      //       {
+      //         title: "限电损失电量",
+      //         yAxisIndex: 0,
+      //         value: xdssdl,
+      //       },
+      //       {
+      //         title: "受累损失电量",
+      //         yAxisIndex: 0,
+      //         value: slssdl,
+      //       }
+      //     );
+      //     that.tableData.data = dataTab;
+
+      //     that.innerFdl = fdl;
+      //     that.outerFdl = fdl;
+
+      //     that.innerCz = cz;
+      //     that.outerCz = cz;
+
+      //     that.innerLl = ll;
+      //     that.outerLl = ll;
+
+      //     that.analyis = analyis;
+      //   },
+      // });
     },
     AjaxDbfx() {
       var that = this;

src/views/Decision/Decision3.vue

@@ -181,7 +181,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import Table from "./table.vue";
 import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 import Dayinfo from "./dayinfo.vue";
-
+import api from "@api/economic/index.js";
 export default {
   components: {
     Panel,
@@ -782,15 +782,22 @@ 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.benchmarkingWplist2({
+         projects: val,
+      }).then((res) => {
+        this.ChangZhan = res.data;
       });
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/wplist",
+      //   success(res) {
+      //     that.ChangZhan = res.data;
+      //   },
+      // });
     },
     ChangZhanChange(val) {
       this.value1 = val;
@@ -828,23 +835,17 @@ export default {
       }
     },
     AjaxCommon() {
-      var that = this;
-      that.API.requestData({
-        //五项损失率
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/wxssl",
-        data: {
-          wpids: that.value1,
+
+      api.benchmarkingWxssl({
+         wpids: this.value1,
           projectids: [],
           lineids: [],
-          beginDate: that.value4,
-          endDate: that.value5,
+          beginDate: this.value4,
+          endDate: this.value5,
           target: "",
           sort: "",
-        },
-        success(res) {
-          that.ajaxData = res.data;
+      }).then((res) => {
+             this.ajaxData = res.data;
           var analyis = [],
             gzssdl = [],
             jxssdl = [],
@@ -852,8 +853,8 @@ export default {
             xdssdl = [],
             slssdl = [];
 
-          that.ajaxData.forEach((item, index) => {
-            that.tableIdArr.push(item.id);
+          this.ajaxData.forEach((item, index) => {
+            this.tableIdArr.push(item.id);
             gzssdl.push({
               text: item.name,
               value: item.gzssdl,
@@ -902,10 +903,89 @@ export default {
               value: slssdl,
             }
           );
-          that.tableType(that.value2);
-          that.analyis = analyis;
-        },
+          this.tableType(this.value2);
+          this.analyis = analyis;
       });
+
+
+      // var that = this;
+      // that.API.requestData({
+      //   //五项损失率
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/wxssl",
+      //   data: {
+      //     wpids: that.value1,
+      //     projectids: [],
+      //     lineids: [],
+      //     beginDate: that.value4,
+      //     endDate: that.value5,
+      //     target: "",
+      //     sort: "",
+      //   },
+      //   success(res) {
+      //     that.ajaxData = res.data;
+      //     var analyis = [],
+      //       gzssdl = [],
+      //       jxssdl = [],
+      //       xnssdl = [],
+      //       xdssdl = [],
+      //       slssdl = [];
+
+      //     that.ajaxData.forEach((item, index) => {
+      //       that.tableIdArr.push(item.id);
+      //       gzssdl.push({
+      //         text: item.name,
+      //         value: item.gzssdl,
+      //       });
+      //       jxssdl.push({
+      //         text: item.name,
+      //         value: item.jxssdl,
+      //       });
+      //       xnssdl.push({
+      //         text: item.name,
+      //         value: item.xnssdl,
+      //       });
+      //       xdssdl.push({
+      //         text: item.name,
+      //         value: item.xdssdl,
+      //       });
+      //       slssdl.push({
+      //         text: item.name,
+      //         value: item.slssdl,
+      //       });
+      //     });
+      //     analyis.push(
+      //       {
+      //         title: "故障损失电量",
+      //         yAxisIndex: 0,
+      //         value: gzssdl,
+      //       },
+      //       {
+      //         title: "检修损失电量",
+      //         yAxisIndex: 0,
+      //         value: jxssdl,
+      //       },
+      //       {
+      //         title: "性能损失电量",
+      //         yAxisIndex: 0,
+      //         value: xnssdl,
+      //       },
+      //       {
+      //         title: "限电损失电量",
+      //         yAxisIndex: 0,
+      //         value: xdssdl,
+      //       },
+      //       {
+      //         title: "受累损失电量",
+      //         yAxisIndex: 0,
+      //         value: slssdl,
+      //       }
+      //     );
+      //     that.tableType(that.value2);
+      //     that.analyis = analyis;
+      //   },
+      // });
     },
     AjaxDbfx() {
       var that = this;
@@ -1102,21 +1182,17 @@ export default {
       var dataId = that.tableIdArr[data.index - 1];
       that.clearDb();
       that.detailShow = 2;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/details",
-        data: {
-          id: dataId,
-          beginDate: that.value4,
-          endDate: that.value5,
+
+      api.benchmarkingDetails({
+         id: dataId,
+          beginDate: this.value4,
+          endDate: this.value5,
           target: "",
           sort: "",
-        },
-        success(res) {
-          var dataTab = [];
+      }).then((res) => {
+            var dataTab = [];
           res.data.forEach((item, index) => {
-            that.tableIdArr.push(item.id);
+            this.tableIdArr.push(item.id);
 
             dataTab.push({
               //表格
@@ -1148,9 +1224,59 @@ export default {
               is_light: false,
             });
           });
-          that.tableDataDetail.data = dataTab;
-        },
+          this.tableDataDetail.data = dataTab;
       });
+
+
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/details",
+      //   data: {
+      //     id: dataId,
+      //     beginDate: that.value4,
+      //     endDate: that.value5,
+      //     target: "",
+      //     sort: "",
+      //   },
+      //   success(res) {
+      //     var dataTab = [];
+      //     res.data.forEach((item, index) => {
+      //       that.tableIdArr.push(item.id);
+
+      //       dataTab.push({
+      //         //表格
+      //         index: index + 1,
+      //         fdl: item.fdl,
+      //         name: item.name,
+      //         zhpm: item.zhpm,
+      //         gzssdl: item.gzssdl,
+      //         jxssdlpm: item.jxssdlpm,
+      //         jxssdl: item.jxssdl,
+      //         xnssdlpm: item.xnssdlpm,
+      //         xnssdl: item.xnssdl,
+      //         xdssdlpm: item.xdssdlpm,
+      //         xdssdl: item.xdssdl,
+      //         slssdlpm: item.slssdlpm,
+      //         slssdl: item.slssdl,
+      //         fnlylpm: item.fnlylpm,
+      //         fnlyl: item.fnlyl,
+      //         gzsslpm: item.gzsslpm,
+      //         gzssl: item.gzssl,
+      //         jxsslpm: item.jxsslpm,
+      //         jxssl: item.jxssl,
+      //         qflpm: item.qflpm,
+      //         qfl: item.qfl,
+      //         xnsslpm: item.xnsslpm,
+      //         xnssl: item.xnssl,
+      //         slsslpm: item.slsslpm,
+      //         slssl: item.slssl,
+      //         is_light: false,
+      //       });
+      //     });
+      //     that.tableDataDetail.data = dataTab;
+      //   },
+      // });
     },
     checkClick(event, data) {
       var that = this;

src/views/Decision/Decision3Db.vue

@@ -144,6 +144,7 @@ import NormalRadarChart from "../../components/chart/radar/normal-radar-chart.vu
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 import Table from "../../components/coms/table/table.vue";
+import api from "@api/economic/index.js";
 export default {
   components: {
     Table,
@@ -221,15 +222,19 @@ 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.benchmarkingWplist1({}).then((res) => {
+        this.ChangZhan = res.data;
       });
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/wplist",
+      //   success(res) {
+      //     that.ChangZhan = res.data;
+      //   },
+      // });
     },
     ChangZhanChange(val) {
       this.value1 = val;
@@ -238,18 +243,26 @@ export default {
       this.XiangMuVal(val);
     },
     XiangMuVal(val) {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/wtList",
-        data: {
+      api
+        .benchmarkingWtList({
           wpid: val,
-        },
-        success(res) {
-          that.XiangMu = res.data;
-        },
-      });
+        })
+        .then((res) => {
+          this.XiangMu = res.data;
+        });
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/wtList",
+      //   data: {
+      //     wpid: val,
+      //   },
+      //   success(res) {
+      //     that.XiangMu = res.data;
+      //   },
+      // });
     },
     XiangMuChange(val) {
       var that = this;
@@ -273,20 +286,17 @@ export default {
       }
     },
     AjaxCommon() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/" + that.ajaxName,
-        data: {
-          wpid: that.value1,
-          wtids: that.value2,
-          date: that.value4,
+      api
+        .ajaxName({
+          ajaxName: that.ajaxName,
+          wpid: this.value1,
+          wtids: this.value2,
+          date: this.value4,
           target: "",
           sort: "",
-        },
-        success(res) {
-          var data = res.data,
+        })
+        .then((res) => {
+             var data = res.data,
             data2 = [],
             chart = [],
             fzy = [],
@@ -297,7 +307,7 @@ export default {
           jfpl = data.pop(); //静风频率
           fzy = data.pop(); //风资源
           if (fzy["1"] == null) {
-            that.BASE.showMsg({
+            this.BASE.showMsg({
               msg: "此风机无数据",
               type: "success",
             });
@@ -371,20 +381,124 @@ export default {
               },
             ]);
           });
-          that.fzyData = fzyDataArr;
-          that.tableData.data = data2;
-        },
-      });
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/djhxdbbottom",
-        data: {
-          wpid: that.value1,
-          wtids: that.value2,
-          date: that.value4,
-        },
-        success(res) {
+          this.fzyData = fzyDataArr;
+          this.tableData.data = data2;
+        });
+
+
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/" + that.ajaxName,
+      //   data: {
+          
+      //     wpid: that.value1,
+      //     wtids: that.value2,
+      //     date: that.value4,
+      //     target: "",
+      //     sort: "",
+      //   },
+      //   success(res) {
+      //     var data = res.data,
+      //       data2 = [],
+      //       chart = [],
+      //       fzy = [],
+      //       fzyArr = [],
+      //       jfpl = [],
+      //       jfplArr = [];
+      //     let thisItem = [];
+      //     jfpl = data.pop(); //静风频率
+      //     fzy = data.pop(); //风资源
+      //     if (fzy["1"] == null) {
+      //       that.BASE.showMsg({
+      //         msg: "此风机无数据",
+      //         type: "success",
+      //       });
+      //       return false;
+      //     }
+      //     data.forEach((ele, index) => {
+      //       for (let key in ele) {
+      //         if (key !== "name") {
+      //           thisItem.push(ele[key]);
+      //         }
+      //       }
+      //     });
+
+      //     var count = thisItem.length / data.length;
+
+      //     data.forEach((item, index) => {
+      //       data2.push({
+      //         index: index + 1,
+      //         name: item.name,
+      //         data1: thisItem[index * count],
+      //         data2: count >= 2 ? thisItem[index * count + 1] : [],
+      //         data3: count >= 3 ? thisItem[index * count + 2] : [],
+      //         data4: count >= 4 ? thisItem[index * count + 3] : [],
+      //         data5: count >= 5 ? thisItem[index * count + 4] : [],
+      //         is_light: false,
+      //       });
+      //     });
+
+      //     Object.keys(fzy).map((key) => {
+      //       fzyArr.push(fzy[key]);
+      //     });
+      //     Object.keys(jfpl).map((key) => {
+      //       jfplArr.push(jfpl[key]);
+      //     });
+      //     fzyArr.pop();
+      //     var jfplName = jfplArr.pop();
+      //     var indicator = [
+      //       "北",
+      //       "北北西",
+      //       "北西",
+      //       "西北西",
+      //       "西",
+      //       "西南西",
+      //       "南西",
+      //       "南南西",
+      //       "南",
+      //       "南南东",
+      //       "东南",
+      //       "东南东",
+      //       "东",
+      //       "东北东",
+      //       "北东",
+      //       "北北东",
+      //     ];
+
+      //     var fzyDataArr = [];
+      //     fzyArr.forEach((item, index) => {
+      //       var arr = [];
+      //       item.forEach((e, i) => {
+      //         arr.push(e.value);
+      //       });
+      //       fzyDataArr.push([
+      //         {
+      //           indicator: indicator,
+      //           data: [
+      //             {
+      //               value: arr,
+      //             },
+      //           ],
+      //           name: jfplArr[index],
+      //         },
+      //       ]);
+      //     });
+      //     that.fzyData = fzyDataArr;
+      //     that.tableData.data = data2;
+      //   },
+      // });
+
+      api
+        .benchmarkingDjhxdbbottom({
+          wpid: this.value1,
+          wtids: this.value2,
+          date: this.value4,
+        })
+        .then((res) => {
+          console.log(res);
           var data = res.data;
           var arrName = [],
             arrKey = [],
@@ -400,7 +514,7 @@ export default {
               }
             }
           });
-          that.listName = arrName;
+          this.listName = arrName;
           for (var i = 0; i < arrKey.length - 1; i++) {
             //冒泡排序
             for (var j = 0; j < arrKey.length - 1 - i; j++) {
@@ -429,9 +543,70 @@ export default {
               value: arr,
             });
           }
-          that.list = tempArray;
-        },
-      });
+          console.log(tempArray);
+          this.list = tempArray;
+        });
+
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/djhxdbbottom",
+      //   data: {
+      //     wpid: that.value1,
+      //     wtids: that.value2,
+      //     date: that.value4,
+      //   },
+      //   success(res) {
+      //     console.log(res);
+      //     var data = res.data;
+
+      //     var arrName = [],
+      //       arrKey = [],
+      //       arrData = [],
+      //       tempArray = [];
+      //     data.forEach((ele) => {
+      //       for (let key in ele) {
+      //         if (key !== "name") {
+      //           arrKey.push(key);
+      //           arrData.push(ele[key]);
+      //         } else {
+      //           arrName.push(ele[key]);
+      //         }
+      //       }
+      //     });
+      //     that.listName = arrName;
+      //     for (var i = 0; i < arrKey.length - 1; i++) {
+      //       //冒泡排序
+      //       for (var j = 0; j < arrKey.length - 1 - i; j++) {
+      //         if (parseInt(arrKey[j]) > parseInt(arrKey[j + 1])) {
+      //           var temp = arrKey[j];
+      //           arrKey[j] = arrKey[j + 1];
+      //           arrKey[j + 1] = temp;
+      //           var temp2 = arrData[j];
+      //           arrData[j] = arrData[j + 1];
+      //           arrData[j + 1] = temp2;
+      //         }
+      //       }
+      //     }
+      //     for (var i = 0; i < data.length; i++) {
+      //       var arr = [];
+      //       arrData.forEach((e, index) => {
+      //         if (index * data.length + i < arrData.length) {
+      //           arr.push({
+      //             text: arrKey[index * data.length + i],
+      //             value: arrData[index * data.length + i],
+      //           });
+      //         }
+      //       });
+      //       tempArray.push({
+      //         title: arrName[i],
+      //         value: arr,
+      //       });
+      //     }
+      //     console.log(tempArray);
+      //     that.list = tempArray;
+      //   },
+      // });
     },
     reset() {
       //重置

src/views/Decision/Decision4.vue

@@ -71,6 +71,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 import Table from "./table.vue";
 import Dayinfo from "./dayinfo.vue";
+import api from "@api/economic/index.js";
 export default {
   components: {
     Panel,
@@ -215,20 +216,15 @@ export default {
       }
     },
     AjaxCommon() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/zjwxssl",
-        data: {
-          beginDate: that.value4,
-          endDate: that.value5,
-        },
-        success(res) {
-          var data = [];
+
+      api.benchmarkingZjwxssl({
+        beginDate: this.value4,
+          endDate: this.value5,
+      }).then((res) => {
+           var data = [];
 
           res.data.forEach((item, index) => {
-            that.tableIdArr.push(index);
+            this.tableIdArr.push(index);
             data.push({
               index: index + 1,
               dutyname: item.dutyname,
@@ -242,9 +238,39 @@ export default {
               is_light: false,
             });
           });
-          that.tableData.data = data;
-        },
+          this.tableData.data = data;
       });
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/zjwxssl",
+      //   data: {
+      //     beginDate: that.value4,
+      //     endDate: that.value5,
+      //   },
+      //   success(res) {
+      //     var data = [];
+
+      //     res.data.forEach((item, index) => {
+      //       that.tableIdArr.push(index);
+      //       data.push({
+      //         index: index + 1,
+      //         dutyname: item.dutyname,
+      //         theoreticalgeneratity: item.theoreticalgeneratity,
+      //         generatity: item.generatity,
+      //         faultloss: item.faultloss,
+      //         mainloss: item.mainloss,
+      //         performanceloss: item.performanceloss,
+      //         rationingloss: item.rationingloss,
+      //         involvesloss: item.involvesloss,
+      //         is_light: false,
+      //       });
+      //     });
+      //     that.tableData.data = data;
+      //   },
+      // });
     },
     dbfx() {
       var that = this;

src/views/Decision/Decision4Czzl.vue

@@ -76,6 +76,7 @@ import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Panel from "../../components/coms/panel/panel.vue";
 import Table from "../../components/coms/table/table.vue";
 import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
+import api from "@api/economic/index.js";
 export default {
   components: {
     Panel,
@@ -276,17 +277,13 @@ export default {
       }
     },
     AjaxCommon() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/zjlist",
-        data: {
-          beginDate: that.value4,
-          endDate: that.value5,
-        },
-        success(res) {
-          var data = [];
+      api
+        .benchmarkingZjlist({
+         beginDate: this.value4,
+          endDate: this.value5,
+        })
+        .then((res) => {
+             var data = [];
           res.data.forEach((item, index) => {
             data.push({
               index: index + 1,
@@ -307,32 +304,83 @@ export default {
               is_light: false,
             });
           });
-          that.tableData.data = data;
-        },
-      });
+          this.tableData.data = data;
+        });
+
+      // var that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/zjlist",
+      //   data: {
+      //     beginDate: that.value4,
+      //     endDate: that.value5,
+      //   },
+      //   success(res) {
+      //     var data = [];
+      //     res.data.forEach((item, index) => {
+      //       data.push({
+      //         index: index + 1,
+      //         nameOfDuty: item.nameOfDuty,
+      //         startCount: item.startCount,
+      //         stopCount: item.stopCount,
+      //         resetCount: item.resetCount,
+      //         maintainCount: item.maintainCount,
+      //         unmaintainCount: item.unmaintainCount,
+      //         gpmaintainCount: item.gpmaintainCount,
+      //         gpfaultCount: item.gpfaultCount,
+      //         gponsiteinvolvementMaintainCount:
+      //           item.gponsiteinvolvementMaintainCount,
+      //         gponsiteinvolvementFaultCount: item.gponsiteinvolvementFaultCount,
+      //         gpoffsiteaffectedgridCount: item.gpoffsiteaffectedgridCount,
+      //         gpweatherOutsideCount: item.gpweatherOutsideCount,
+      //         ungpCount: item.ungpCount,
+      //         is_light: false,
+      //       });
+      //     });
+      //     that.tableData.data = data;
+      //   },
+      // });
     },
     ajaxClick(dutyname, direct) {
       var that = this;
       that.tabsTit = that.tabsArr[direct - 1];
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/zjdrill",
-        data: {
-          beginDate: that.value4,
-          endDate: that.value5,
+
+        api.benchmarkingZjdrill({
+         beginDate: this.value4,
+          endDate: this.value5,
           dutyname: dutyname,
           direct: direct,
-        },
-        success(res) {
-          if (res.data.length) {
-            that.tabs = res.data;
+      }).then((res) => {
+            if (res.data.length) {
+            this.tabs = res.data;
           } else {
-            that.tabs = [{ wtid: "暂无数据", time: "暂无数据" }];
+            this.tabs = [{ wtid: "暂无数据", time: "暂无数据" }];
           }
-          that.dialogVisible = true;
-        },
+          this.dialogVisible = true;
       });
+
+
+
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/zjdrill",
+      //   data: {
+      //     beginDate: that.value4,
+      //     endDate: that.value5,
+      //     dutyname: dutyname,
+      //     direct: direct,
+      //   },
+      //   success(res) {
+      //     if (res.data.length) {
+      //       that.tabs = res.data;
+      //     } else {
+      //       that.tabs = [{ wtid: "暂无数据", time: "暂无数据" }];
+      //     }
+      //     that.dialogVisible = true;
+      //   },
+      // });
     },
   },
 };

src/views/Decision/slgl/fwjsl.vue

@@ -66,68 +66,68 @@ export default {
             field: "unit",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "5分钟 / 复位次数",
             field: "five",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "5分钟 / 复位率",
             field: "fives",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "10分钟 / 复位次数",
             field: "ten",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "10分钟 / 复位率",
             field: "tens",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "15分钟 / 复位次数",
             field: "fifteen",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "15分钟 / 复位率",
             field: "fifteens",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "20分钟 / 复位次数",
             field: "twenty",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "20分钟 / 复位率",
             field: "twentys",
             is_num: false,
             is_light: false,
-            sortable: true
-          }
+            sortable: true,
+          },
         ],
-        data: []
+        data: [],
       },
-      tableLoading: true
+      tableLoading: true,
     };
   },
   mounted() {
@@ -143,16 +143,14 @@ export default {
     getTable() {
       let that = this;
       that.tableLoading = true;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034/",
-        subUrl: "/threerate/fwjsl",
-        data: {
-          beginDate: this.value1,
-          endDate: this.value2
-        },
-        success(res) {
-          that.tableLoading = false;
+
+      api
+        .threerateFwjsl({
+         beginDate: this.value1,
+          endDate: this.value2,
+        })
+        .then((res) => {
+          this.tableLoading = false;
           if (res.code === 200) {
             var data = [];
             res.data.forEach((item, index) => {
@@ -166,13 +164,43 @@ export default {
                 fifteens: item.swfzfwl,
                 twenty: item.esfz,
                 twentys: item.esfzfwl,
-                is_light: false
+                is_light: false,
               };
             });
-            that.tableData.data = data;
+            this.tableData.data = data;
           }
-        }
-      });
+        });
+
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034/",
+      //   subUrl: "/threerate/fwjsl",
+      //   data: {
+      //     beginDate: this.value1,
+      //     endDate: this.value2,
+      //   },
+      //   success(res) {
+      //     that.tableLoading = false;
+      //     if (res.code === 200) {
+      //       var data = [];
+      //       res.data.forEach((item, index) => {
+      //         data[index] = {
+      //           unit: item.wpid,
+      //           five: item.wfz,
+      //           fives: item.wfzfwl,
+      //           ten: item.sfz,
+      //           tens: item.sfzfwl,
+      //           fifteen: item.swfz,
+      //           fifteens: item.swfzfwl,
+      //           twenty: item.esfz,
+      //           twentys: item.esfzfwl,
+      //           is_light: false,
+      //         };
+      //       });
+      //       that.tableData.data = data;
+      //     }
+      //   },
+      // });
     },
     BeginChange(vl) {
       this.value1 = vl;
@@ -206,8 +234,8 @@ export default {
       } else if (val == 2) {
         return end;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scope>

src/views/Decision/slgl/xqjsl.vue

@@ -53,6 +53,7 @@
 
 <script>
 import ComTable from "@/components/coms/table/table.vue";
+import api from "@api/economic/index.js";
 export default {
   name: "fwjsl",
   components: { ComTable },
@@ -68,32 +69,32 @@ export default {
             field: "wpid",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "故障次数",
             field: "gzCount",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "消缺及时次数",
             field: "xqCount",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "消缺及时次数",
             field: "xqjsl",
             is_num: false,
             is_light: false,
-            sortable: true
-          }
+            sortable: true,
+          },
         ],
-        date: []
-      }
+        date: [],
+      },
     };
   },
   mounted() {
@@ -108,22 +109,36 @@ export default {
     getTable() {
       let that = this;
       that.tableLoading = true;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034/",
-        subUrl: "/threerate/xqjsl",
-        data: {
+
+      api
+        .threerateXqjsl({
           beginDate: this.value1,
-          endDate: this.value2
-        },
-        success(res) {
-          that.tableLoading = false;
+          endDate: this.value2,
+        })
+        .then((res) => {
+          this.tableLoading = false;
           console.log(res);
           if (res.code === 200) {
-            that.tableData.data = res.data;
+            this.tableData.data = res.data;
           }
-        }
-      });
+        });
+
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034/",
+      //   subUrl: "/threerate/xqjsl",
+      //   data: {
+      //     beginDate: this.value1,
+      //     endDate: this.value2
+      //   },
+      //   success(res) {
+      //     that.tableLoading = false;
+      //     console.log(res);
+      //     if (res.code === 200) {
+      //       that.tableData.data = res.data;
+      //     }
+      //   }
+      // });
     },
     // 开始日期：
     BeginChange(vl) {
@@ -148,10 +163,10 @@ export default {
       //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
       var date = new Date();
       var year = date.getFullYear(),
-          month = date.getMonth() + 1,
-          day = date.getDate();
-          month >= 1 && month <= 9 ? (month = "0" + month) : "";
-          day >= 0 && day <= 9 ? (day = "0" + day) : "";
+        month = date.getMonth() + 1,
+        day = date.getDate();
+      month >= 1 && month <= 9 ? (month = "0" + month) : "";
+      day >= 0 && day <= 9 ? (day = "0" + day) : "";
       var begin = year + "-" + month + "-01";
       var end = year + "-" + month + "-" + day;
       if (val == 1) {
@@ -159,7 +174,7 @@ export default {
       } else if (val == 2) {
         return end;
       }
-    }
-  }
+    },
+  },
 };
 </script>

src/views/Decision/slgl/ztzhl.vue

@@ -65,6 +65,7 @@
 </template>
 <script>
 import ComTable from "@/components/coms/table/table.vue";
+import api from "@api/economic/index.js";
 export default {
   name: "ztzhl",
   components: { ComTable },
@@ -160,28 +161,46 @@ export default {
     getTable() {
       let that = this;
       that.tableLoading = true;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034/",
-        subUrl: "/threerate/ztzhl",
-        data: {
-          beginDate: this.value1,
+      api.threerateZtzhl({
+        beginDate: this.value1,
           endDate: this.value2
-        },
-        success(res) {
-          that.tableLoading = false;
-          const vs = that.vshows;
+      }).then((res) => {
+         this.tableLoading = false;
+          const vs = this.vshows;
           if (res.code === 200) {
             if (vs == "小于3米风速") {
-              that.tableData.data = res.data.小于3米风速;
+              this.tableData.data = res.data.小于3米风速;
             } else if (vs == "大于3米风速") {
-              that.tableData.data = res.data.大于3米风速;
+              this.tableData.data = res.data.大于3米风速;
             } else {
-              that.tableData.data = res.data.大于4米风速;
+              this.tableData.data = res.data.大于4米风速;
             }
           }
-        }
       });
+
+
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034/",
+      //   subUrl: "/threerate/ztzhl",
+      //   data: {
+      //     beginDate: this.value1,
+      //     endDate: this.value2
+      //   },
+      //   success(res) {
+      //     that.tableLoading = false;
+      //     const vs = that.vshows;
+      //     if (res.code === 200) {
+      //       if (vs == "小于3米风速") {
+      //         that.tableData.data = res.data.小于3米风速;
+      //       } else if (vs == "大于3米风速") {
+      //         that.tableData.data = res.data.大于3米风速;
+      //       } else {
+      //         that.tableData.data = res.data.大于4米风速;
+      //       }
+      //     }
+      //   }
+      // });
     },
     BeginChange(vl) {
       this.value1 = vl;

src/views/Decision/zbtjfx.vue

@@ -188,6 +188,7 @@
 </template>
 
 <script>
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {},
@@ -207,27 +208,40 @@ export default {
   created() {
     this.requestData();
   },
-  methods: {
+  methods: {  
     requestData() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034/",
-        subUrl: "targetdata/jnjpkpi",
-        data: {
-          month: that.month,
-        },
-        success(res) {
-          that.fdl = res.data.fdl.toFixed(2);
-          that.gls = res.data.gls.toFixed(2);
-          that.hs = res.data.hs.toFixed(2);
-          that.jyco2 = res.data.jyco2.toFixed(2);
-          that.jym = res.data.jym.toFixed(2);
-          that.jys = res.data.jys.toFixed(2);
-          that.jyso2 = res.data.jyso2.toFixed(2);
-          that.wqw = res.data.wqw.toFixed(2);
-        },
+      api.benchmarkingLineList({
+         month: this.month,
+      }).then((res) => {
+         this.fdl = res.data.fdl.toFixed(2);
+          this.gls = res.data.gls.toFixed(2);
+          this.hs = res.data.hs.toFixed(2);
+          this.jyco2 = res.data.jyco2.toFixed(2);
+          this.jym = res.data.jym.toFixed(2);
+          this.jys = res.data.jys.toFixed(2);
+          this.jyso2 = res.data.jyso2.toFixed(2);
+          this.wqw = res.data.wqw.toFixed(2);
       });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034/",
+      //   subUrl: "targetdata/jnjpkpi",
+      //   data: {
+      //     month: that.month,
+      //   },
+      //   success(res) {
+      //     that.fdl = res.data.fdl.toFixed(2);
+      //     that.gls = res.data.gls.toFixed(2);
+      //     that.hs = res.data.hs.toFixed(2);
+      //     that.jyco2 = res.data.jyco2.toFixed(2);
+      //     that.jym = res.data.jym.toFixed(2);
+      //     that.jys = res.data.jys.toFixed(2);
+      //     that.jyso2 = res.data.jyso2.toFixed(2);
+      //     that.wqw = res.data.wqw.toFixed(2);
+      //   },
+      // });
     },
   },
 };

src/views/NewPages/dj1.vue

@@ -736,6 +736,7 @@ import DirectionRadarChart from "../../components/chart/radar/direction-radar-ch
 import RadarChart from "../../components/chart/radar/radar-chart.vue";
 import panel from "../../components/coms/panel/panel.vue";
 import Table from "../../components/coms/table/table.vue";
+import api from "@api/economic/index.js";
 export default {
   components: {
     panel,
@@ -1016,39 +1017,62 @@ export default {
   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);
-        },
+      api.powercompareWindfarmAjax({}).then((res) => {
+        this.wpArray = res.data;
+        this.wpId = this.wpId || res.data[0].id;
+        this.getWtArray(this.wpId, true);
       });
+
+      // 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) {
       let that = this;
       if (wpId) {
-        that.API.requestData({
-          method: "GET",
-          subUrl: "powercompare/windturbineAjax",
-          data: {
+        // ----------------------------
+
+        api
+          .powercompareWindturbineAjax({
             wpId,
-          },
-          success(res) {
-            that.wtArray = res.data;
+          })
+          .then((res) => {
+            this.wtArray = res.data;
             const findRes = res.data.some((ele) => {
-              return ele.id === that.wtId;
+              return ele.id === this.wtId;
             });
-            that.wtId = findRes ? that.wtId : res.data[0].id;
+            this.wtId = findRes ? this.wtId : res.data[0].id;
             if (keepRequest) {
-              that.search();
+              this.search();
             }
-          },
-        });
+          });
+
+        // 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;
+        //     if (keepRequest) {
+        //       that.search();
+        //     }
+        //   },
+        // });
       } else {
         that.wtArray = [];
         that.wtId = "";
@@ -1057,15 +1081,12 @@ export default {
 
     // tab1 - 获取损失电量分析图表数据
     getLostChartData() {
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "goodness/findWtRealPowerChar",
-        data: {
-          wtId: that.wtId,
-          recorddate: that.recorddate,
-        },
-        success(res) {
+      api
+        .goodnessFindWtRealPowerChar({
+          wtId: this.wtId,
+          recorddate: this.recorddate,
+        })
+        .then((res) => {
           const keyArray = ["value1", "value2", "value3"];
 
           let lostChartData = [
@@ -1095,25 +1116,65 @@ export default {
               });
             });
           });
-          that.lostChartData = lostChartData;
-          that.lostChartUnit = lostChartUnit;
-          that.getLostChartBgColorData();
-        },
-      });
+          this.lostChartData = lostChartData;
+          this.lostChartUnit = lostChartUnit;
+          this.getLostChartBgColorData();
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "POST",
+      //   subUrl: "goodness/findWtRealPowerChar",
+      //   data: {
+      //     wtId: that.wtId,
+      //     recorddate: that.recorddate,
+      //   },
+      //   success(res) {
+      //     const keyArray = ["value1", "value2", "value3"];
+
+      //     let lostChartData = [
+      //       {
+      //         text: "实发功率",
+      //         yAxisIndex: 0,
+      //         value: [],
+      //       },
+      //       {
+      //         text: "保证功率",
+      //         yAxisIndex: 0,
+      //         value: [],
+      //       },
+      //       {
+      //         text: "风速",
+      //         yAxisIndex: 3,
+      //         value: [],
+      //       },
+      //     ];
+      //     const lostChartUnit = ["实发功率", "保证功率", "风速"];
+
+      //     keyArray.forEach((key, keyIndex) => {
+      //       res.data.forEach((ele) => {
+      //         lostChartData[keyIndex].value.push({
+      //           text: new Date(ele.time).formatDate("MM-dd hh:mm"),
+      //           value: ele[key],
+      //         });
+      //       });
+      //     });
+      //     that.lostChartData = lostChartData;
+      //     that.lostChartUnit = lostChartUnit;
+      //     that.getLostChartBgColorData();
+      //   },
+      // });
     },
 
     // tab1 - 获取损失电量分析图表背景颜色
     getLostChartBgColorData() {
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "goodness/getplotBands",
-        data: {
-          wtId: that.wtId,
-          recorddate: that.recorddate,
-        },
-        success(res) {
-          let LostChartBgColorData = [];
+      api
+        .goodnessGetplotBands({
+          wtId: this.wtId,
+          recorddate: this.recorddate,
+        })
+        .then((res) => {
+               let LostChartBgColorData = [];
           res.data.forEach((pEle, pIndex) => {
             LostChartBgColorData.push({
               name: pEle[0].name,
@@ -1125,12 +1186,39 @@ export default {
               color: pEle[0].itemStyle.color,
               beginDate: pEle[0].time1,
               endDate: pEle[0].time2,
-              wtId: that.wtId,
+              wtId: this.wtId,
             });
           });
-          that.LostChartBgColorData = LostChartBgColorData;
-        },
-      });
+          this.LostChartBgColorData = LostChartBgColorData;
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "POST",
+      //   subUrl: "goodness/getplotBands",
+      //   data: {
+      //     wtId: that.wtId,
+      //     recorddate: that.recorddate,
+      //   },
+      //   success(res) {
+      //     let LostChartBgColorData = [];
+      //     res.data.forEach((pEle, pIndex) => {
+      //       LostChartBgColorData.push({
+      //         name: pEle[0].name,
+      //         start: pIndex ? LostChartBgColorData[pIndex - 1].end : 0,
+      //         end:
+      //           (pIndex ? LostChartBgColorData[pIndex - 1].end : 0) +
+      //           (new Date(pEle[0].time2).getTime() / 1000 -
+      //             new Date(pEle[0].time1).getTime() / 1000),
+      //         color: pEle[0].itemStyle.color,
+      //         beginDate: pEle[0].time1,
+      //         endDate: pEle[0].time2,
+      //         wtId: that.wtId,
+      //       });
+      //     });
+      //     that.LostChartBgColorData = LostChartBgColorData;
+      //   },
+      // });
     },
 
     // 损失电量分析图背景颜色区域点击事件

src/views/NewPages/power-benchmarking.vue

@@ -348,6 +348,7 @@ import MultipleBarChart from "../../components/chart/bar/multiple-bar-chart.vue"
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Panel from "../../components/coms/panel/panel.vue";
 import groupTable from "../../components/coms/table/group-table.vue";
+import api from "@api/economic/index.js";
 export default {
   components: { groupTable, Panel, MultipleBarChart, SvgIcon },
   data() {
@@ -640,16 +641,12 @@ export default {
     },
     // 表格数据
     requestDataTable(timetype) {
-      let that = this;
-      this.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/dbmainbottom",
-        data: {
+      api
+        .benchmarkingDbmainbottom({
           timetype: timetype,
           foreigntype: "风电",
-        },
-        success(res) {
+        })
+        .then((res) => {
           if (res.code == 200) {
             res.data.forEach((item) => {
               if (item.foreignkeyid === "SBQ_FDC") item.name = "石板泉";
@@ -878,24 +875,273 @@ export default {
             that.setRank();
             that.echartData(that.eltableData.column[1].child.slice(3));
           }
-        },
-      });
+        });
+
+      // let that = this;
+      // this.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/dbmainbottom",
+      //   data: {
+      //     timetype: timetype,
+      //     foreigntype: "风电",
+      //   },
+      // success(res) {
+      //   if (res.code == 200) {
+      //     res.data.forEach((item) => {
+      //       if (item.foreignkeyid === "SBQ_FDC") item.name = "石板泉";
+      //       if (item.foreignkeyid === "MHS_FDC") item.name = "麻黄山";
+      //       if (item.foreignkeyid === "NSS_FDC") item.name = "牛首山";
+      //       if (item.foreignkeyid === "XS_FDC") item.name = "香山";
+      //       if (item.foreignkeyid === "QS_FDC") item.name = "青山";
+      //       item.mark = that.filter(item.mark);
+      //       item.theoreticalpower = that.filter(item.theoreticalpower);
+      //       item.actualpower = that.filter(item.actualpower);
+      //       item.daynhgzssdl = that.filter(item.daynhgzssdl);
+      //       item.daynhwhssdl = that.filter(item.daynhwhssdl);
+      //       item.daynhxdssdl = that.filter(item.daynhxdssdl);
+      //       item.daynhcfdl = that.filter(item.daynhcfdl);
+      //       item.daynhqfdl = that.filter(item.daynhqfdl);
+      //       item.windenergy = that.filter(item.windenergy);
+      //       item.powerlossrate = that.filter(item.powerlossrate);
+      //       item.performancelossrate = that.filter(item.performancelossrate);
+      //       item.comprehensiverate = that.filter(item.comprehensiverate);
+      //       item.utilizationhours = that.filter(item.utilizationhours);
+      //       item.windpoweraccuracy = that.filter(item.windpoweraccuracy);
+      //       item.agccurvefollowing = that.filter(item.agccurvefollowing);
+      //       item.mtbf = that.filter(item.mtbf);
+      //       item.mttf = that.filter(item.mttf);
+      //       item.availability = that.filter(item.availability);
+      //       item.availabilityfactor = that.filter(item.availabilityfactor);
+      //       item.failurelossrate = that.filter(item.failurelossrate);
+      //       item.mainlossrate = that.filter(item.mainlossrate);
+      //       item.mttr = that.filter(item.mttr);
+      //       item.hiddentimely = that.filter(item.hiddentimely);
+      //       item.resettimelyrate = that.filter(item.resettimelyrate);
+      //       item.statetransitionrate = that.filter(item.statetransitionrate);
+      //       item.eliminationrate = that.filter(item.eliminationrate);
+      //     });
+
+      //     // 合计列
+      //     let item = res.data;
+      //     let obj = {
+      //       name: "合计",
+      //       mark: that.filter(
+      //         (Number(item[0].mark) +
+      //           Number(item[1].mark) +
+      //           Number(item[2].mark) +
+      //           Number(item[3].mark)) /
+      //           4
+      //       ),
+      //       capacity: that.filter(
+      //         Number(item[0].capacity) +
+      //           Number(item[1].capacity) +
+      //           Number(item[2].capacity) +
+      //           Number(item[3].capacity)
+      //       ),
+      //       units: that.filter(
+      //         Number(item[0].units) +
+      //           Number(item[1].units) +
+      //           Number(item[2].units) +
+      //           Number(item[3].units)
+      //       ),
+      //       theoreticalpower: that.filter(
+      //         Number(item[0].theoreticalpower) +
+      //           Number(item[1].theoreticalpower) +
+      //           Number(item[2].theoreticalpower) +
+      //           Number(item[3].theoreticalpower)
+      //       ),
+      //       actualpower: that.filter(
+      //         Number(item[0].actualpower) +
+      //           Number(item[1].actualpower) +
+      //           Number(item[2].actualpower) +
+      //           Number(item[3].actualpower)
+      //       ),
+      //       daynhgzssdl: that.filter(
+      //         Number(item[0].daynhgzssdl) +
+      //           Number(item[1].daynhgzssdl) +
+      //           Number(item[2].daynhgzssdl) +
+      //           Number(item[3].daynhgzssdl)
+      //       ),
+      //       daynhwhssdl: that.filter(
+      //         Number(item[0].daynhwhssdl) +
+      //           Number(item[1].daynhwhssdl) +
+      //           Number(item[2].daynhwhssdl) +
+      //           Number(item[3].daynhwhssdl)
+      //       ),
+      //       daynhxdssdl: that.filter(
+      //         Number(item[0].daynhxdssdl) +
+      //           Number(item[1].daynhxdssdl) +
+      //           Number(item[2].daynhxdssdl) +
+      //           Number(item[3].daynhxdssdl)
+      //       ),
+      //       daynhcfdl: that.filter(
+      //         Number(item[0].daynhcfdl) +
+      //           Number(item[1].daynhcfdl) +
+      //           Number(item[2].daynhcfdl) +
+      //           Number(item[3].daynhcfdl)
+      //       ),
+      //       daynhqfdl: that.filter(
+      //         Number(item[0].daynhqfdl) +
+      //           Number(item[1].daynhqfdl) +
+      //           Number(item[2].daynhqfdl) +
+      //           Number(item[3].daynhqfdl)
+      //       ),
+      //       windenergy: that.filter(
+      //         (Number(item[0].windenergy) +
+      //           Number(item[1].windenergy) +
+      //           Number(item[2].windenergy) +
+      //           Number(item[3].windenergy)) /
+      //           4
+      //       ),
+      //       powerlossrate: that.filter(
+      //         (Number(item[0].powerlossrate) +
+      //           Number(item[1].powerlossrate) +
+      //           Number(item[2].powerlossrate) +
+      //           Number(item[3].powerlossrate)) /
+      //           4
+      //       ),
+      //       performancelossrate: that.filter(
+      //         (Number(item[0].performancelossrate) +
+      //           Number(item[1].performancelossrate) +
+      //           Number(item[2].performancelossrate) +
+      //           Number(item[3].performancelossrate)) /
+      //           4
+      //       ),
+      //       comprehensiverate: that.filter(
+      //         (Number(item[0].comprehensiverate) +
+      //           Number(item[1].comprehensiverate) +
+      //           Number(item[2].comprehensiverate) +
+      //           Number(item[3].comprehensiverate)) /
+      //           4
+      //       ),
+      //       utilizationhours: that.filter(
+      //         Number(item[0].utilizationhours) +
+      //           Number(item[1].utilizationhours) +
+      //           Number(item[2].utilizationhours) +
+      //           Number(item[3].utilizationhours)
+      //       ),
+      //       windpoweraccuracy: that.filter(
+      //         (Number(item[0].windpoweraccuracy) +
+      //           Number(item[1].windpoweraccuracy) +
+      //           Number(item[2].windpoweraccuracy) +
+      //           Number(item[3].windpoweraccuracy)) /
+      //           4
+      //       ),
+      //       agccurvefollowing: that.filter(
+      //         (Number(item[0].agccurvefollowing) +
+      //           Number(item[1].agccurvefollowing) +
+      //           Number(item[2].agccurvefollowing) +
+      //           Number(item[3].agccurvefollowing)) /
+      //           4
+      //       ),
+      //       mtbf: that.filter(
+      //         Number(item[0].mtbf) +
+      //           Number(item[1].mtbf) +
+      //           Number(item[2].mtbf) +
+      //           Number(item[3].mtbf)
+      //       ),
+      //       mttf: that.filter(
+      //         Number(item[0].mttf) +
+      //           Number(item[1].mttf) +
+      //           Number(item[2].mttf) +
+      //           Number(item[3].mttf)
+      //       ),
+      //       availability: that.filter(
+      //         (Number(item[0].availability) +
+      //           Number(item[1].availability) +
+      //           Number(item[2].availability) +
+      //           Number(item[3].availability)) /
+      //           4
+      //       ),
+      //       availabilityfactor: that.filter(
+      //         (Number(item[0].availabilityfactor) +
+      //           Number(item[1].availabilityfactor) +
+      //           Number(item[2].availabilityfactor) +
+      //           Number(item[3].availabilityfactor)) /
+      //           4
+      //       ),
+      //       failurelossrate: that.filter(
+      //         (Number(item[0].failurelossrate) +
+      //           Number(item[1].failurelossrate) +
+      //           Number(item[2].failurelossrate) +
+      //           Number(item[3].failurelossrate)) /
+      //           4
+      //       ),
+      //       mainlossrate: that.filter(
+      //         (Number(item[0].mainlossrate) +
+      //           Number(item[1].mainlossrate) +
+      //           Number(item[2].mainlossrate) +
+      //           Number(item[3].mainlossrate)) /
+      //           4
+      //       ),
+      //       mttr: that.filter(
+      //         Number(item[0].mttr) +
+      //           Number(item[1].mttr) +
+      //           Number(item[2].mttr) +
+      //           Number(item[3].mttr)
+      //       ),
+      //       hiddentimely: that.filter(
+      //         (Number(item[0].hiddentimely) +
+      //           Number(item[1].hiddentimely) +
+      //           Number(item[2].hiddentimely) +
+      //           Number(item[3].hiddentimely)) /
+      //           4
+      //       ),
+      //       resettimelyrate: that.filter(
+      //         (Number(item[0].resettimelyrate) +
+      //           Number(item[1].resettimelyrate) +
+      //           Number(item[2].resettimelyrate) +
+      //           Number(item[3].resettimelyrate)) /
+      //           4
+      //       ),
+      //       statetransitionrate: that.filter(
+      //         (Number(item[0].statetransitionrate) +
+      //           Number(item[1].statetransitionrate) +
+      //           Number(item[2].statetransitionrate) +
+      //           Number(item[3].statetransitionrate)) /
+      //           4
+      //       ),
+      //       eliminationrate: that.filter(
+      //         (Number(item[0].eliminationrate) +
+      //           Number(item[1].eliminationrate) +
+      //           Number(item[2].eliminationrate) +
+      //           Number(item[3].eliminationrate)) /
+      //           4
+      //       ),
+      //     };
+      //     item.push(obj);
+      //     that.eltableData.data = res.data;
+      //     that.setRank();
+      //     that.echartData(that.eltableData.column[1].child.slice(3));
+      //   }
+      // },
+      // });
     },
     // 顶部数据
     requestDataTop(timetype) {
-      let that = this;
-      this.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/dbmaintop",
-        data: {
+      api
+        .benchmarkingLineList({
           timetype: timetype,
           foreigntype: "风电",
-        },
-        success(res) {
-          if (res.code == 200) that.calculate(res.data);
-        },
-      });
+        })
+        .then((res) => {
+          if (res.code == 200) this.calculate(res.data);
+        });
+
+      // let that = this;
+      // this.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.83.66.220:8020/",
+      //   subUrl: "benchmarking/dbmaintop",
+      //   data: {
+      //     timetype: timetype,
+      //     foreigntype: "风电",
+      //   },
+      //   success(res) {
+      //     if (res.code == 200) that.calculate(res.data);
+      //   },
+      // });
     },
     // 左边的排序
     setRank(column, name) {

src/views/WindSite/pages/Map.vue

@@ -49,7 +49,7 @@
         </div>
         <div class="sub-title-item">
           <img src="../../../assets/map/fan/black.png" />
-          <span class="sub-title gray">离线台数</span>
+          <span class="sub-title gray">离线台数{{wpId}}</span>
           <span class="sub-count font-num gray">{{ wpnumMap.lxts }}</span>
         </div>
       </div>
@@ -329,7 +329,6 @@ export default {
         });
       });
     },
-
     clickMap: function (info) {
       //   this.showPopup = true;
     },

src/views/layout/Menu.vue

@@ -419,6 +419,16 @@ export default {
                   icon: "svg-wind-site",
                   path: "/health/gzzd/malfunctionRecall",
                 },
+                // {
+                //   text: "故障分类",
+                //   icon: "svg-wind-site",
+                //   path: "/health/gzzd/gzfl",
+                // },
+                // {
+                //   text: "预警分类",
+                //   icon: "svg-wind-site",
+                //   path: "/health/gzzd/yjfl",
+                // },
               ],
             },
             {

src/views/performanceAnalysis/index.vue

@@ -129,6 +129,7 @@
 
 <script>
 import ComTable from "@com/coms/table/table.vue";
+import api from "@api/economic/index.js";
 export default {
   // 名称
   name: "cutAnalyse",
@@ -421,16 +422,22 @@ export default {
   methods: {
     // 请求服务
     requestData() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windfarmAjax",
-        success(res) {
-          that.wpArray = res.data;
-          that.wpId = res.data[0].id;
-          that.getOutputSpeedList(that.wpId);
-        },
+      api.powercompareWindfarmAjax({}).then((res) => {
+        this.wpArray = res.data;
+        this.wpId = res.data[0].id;
+        this.getOutputSpeedList(that.wpId);
       });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   subUrl: "powercompare/windfarmAjax",
+      //   success(res) {
+      //     that.wpArray = res.data;
+      //     that.wpId = res.data[0].id;
+      //     that.getOutputSpeedList(that.wpId);
+      //   },
+      // });
     },
 
     getOutputSpeedList(wpId) {
@@ -440,72 +447,136 @@ export default {
           msg: "场站与日期不可为空",
         });
       } else {
-        that.API.requestData({
-          method: "POST",
-          subUrl: "goodness/windturbinegoodness",
-          data: {
+        api
+          .goodnessWindturbinegoodness({
             wpId,
             isAsc: that.isAsc,
             recorddate: that.recorddate,
-          },
-          success(res) {
-            that.tableData.data = res.data.list;
-          },
-        });
+          })
+          .then((res) => {
+            this.tableData.data = res.data.list;
+          });
+
+        // that.API.requestData({
+        //   method: "POST",
+        //   subUrl: "goodness/windturbinegoodness",
+        //   data: {
+        //     wpId,
+        //     isAsc: that.isAsc,
+        //     recorddate: that.recorddate,
+        //   },
+        //   success(res) {
+        //     that.tableData.data = res.data.list;
+        //   },
+        // });
       }
     },
 
     getOutputspeedHistoryList(item) {
-      let that = this;
-
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windturbineAjax",
-        data: {
+      api
+        .powercompareWindturbineAjax({
           wpId: item.windtpowerstationid,
-        },
-        success(res) {
-          that.wtArray = res.data;
-
-          that.wpId2 = item.windtpowerstationid;
-          that.wtId = item.windturbineid;
-          that.beginDate = new Date().formatDate("yyyy-MM") + "-01";
-          that.endDate = new Date().formatDate("yyyy-MM-dd");
-
-          that.API.requestData({
-            method: "POST",
-            subUrl: "goodness/goodhistorylist",
-            data: {
-              wpId: that.wpId2,
-              wtId: that.wtId,
-              beginDate: that.beginDate,
-              endDate: that.endDate,
-            },
-            success(res) {
+        })
+        .then((res) => {
+          this.wtArray = res.data;
+
+          this.wpId2 = item.windtpowerstationid;
+          this.wtId = item.windturbineid;
+          this.beginDate = new Date().formatDate("yyyy-MM") + "-01";
+          this.endDate = new Date().formatDate("yyyy-MM-dd");
+
+          api
+            .goodnessGoodhistorylist({
+              wpId: this.wpId2,
+              wtId: this.wtId,
+              beginDate: this.beginDate,
+              endDate: this.endDate,
+            })
+            .then((res) => {
               res.data.forEach((ele) => {
                 ele.time = new Date(ele.recorddate).formatDate("yyyy-MM-dd");
               });
-              that.historyTableData.data = res.data;
-              that.dialogShow = true;
-            },
-          });
-        },
-      });
+              this.historyTableData.data = res.data;
+              this.dialogShow = true;
+            });
+
+          // that.API.requestData({
+          //   method: "POST",
+          //   subUrl: "goodness/goodhistorylist",
+          //   data: {
+          //     wpId: that.wpId2,
+          //     wtId: that.wtId,
+          //     beginDate: that.beginDate,
+          //     endDate: that.endDate,
+          //   },
+          //   success(res) {
+          //     res.data.forEach((ele) => {
+          //       ele.time = new Date(ele.recorddate).formatDate("yyyy-MM-dd");
+          //     });
+          //     that.historyTableData.data = res.data;
+          //     that.dialogShow = true;
+          //   },
+          // });
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   subUrl: "powercompare/windturbineAjax",
+      //   data: {
+      //     wpId: item.windtpowerstationid,
+      //   },
+      //   success(res) {
+      //     that.wtArray = res.data;
+
+      //     that.wpId2 = item.windtpowerstationid;
+      //     that.wtId = item.windturbineid;
+      //     that.beginDate = new Date().formatDate("yyyy-MM") + "-01";
+      //     that.endDate = new Date().formatDate("yyyy-MM-dd");
+
+      //     that.API.requestData({
+      //       method: "POST",
+      //       subUrl: "goodness/goodhistorylist",
+      //       data: {
+      //         wpId: that.wpId2,
+      //         wtId: that.wtId,
+      //         beginDate: that.beginDate,
+      //         endDate: that.endDate,
+      //       },
+      //       success(res) {
+      //         res.data.forEach((ele) => {
+      //           ele.time = new Date(ele.recorddate).formatDate("yyyy-MM-dd");
+      //         });
+      //         that.historyTableData.data = res.data;
+      //         that.dialogShow = true;
+      //       },
+      //     });
+      //   },
+      // });
     },
 
     reGetWtArray() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windturbineAjax",
-        data: {
-          wpId: that.wpId2,
-        },
-        success(res) {
-          that.wtArray = res.data;
-          that.wtId = res.data[0].id;
-        },
-      });
+      api
+        .powercompareWindturbineAjax({
+          wpId: this.wpId2,
+        })
+        .then((res) => {
+          this.wtArray = res.data;
+          this.wtId = res.data[0].id;
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   subUrl: "powercompare/windturbineAjax",
+      //   data: {
+      //     wpId: that.wpId2,
+      //   },
+      //   success(res) {
+      //     that.wtArray = res.data;
+      //     that.wtId = res.data[0].id;
+      //   },
+      // });
     },
 
     reGetHistoryTableData() {
@@ -523,24 +594,39 @@ export default {
           msg: "开始日期与结束日期不可为空",
         });
       } else {
-        that.API.requestData({
-          method: "POST",
-          subUrl: "goodness/goodhistorylist",
-          showLoading: true,
-          data: {
-            wpId: that.wpId2,
-            wtId: that.wtId,
-            beginDate: that.beginDate,
-            endDate: that.endDate,
-          },
-          success(res) {
-            res.data.forEach((ele) => {
+        // -------------------------------------------------
+
+        api.goodnessGoodhistorylist({
+         wpId: this.wpId2,
+            wtId: this.wtId,
+            beginDate: this.beginDate,
+            endDate: this.endDate,
+      }).then((res) => {
+          res.data.forEach((ele) => {
               ele.time = new Date(ele.recorddate).formatDate("yyyy-MM-dd");
             });
-            that.historyTableData.data = res.data;
-            that.dialogShow = true;
-          },
-        });
+            this.historyTableData.data = res.data;
+            this.dialogShow = true;
+      });
+
+        // that.API.requestData({
+        //   method: "POST",
+        //   subUrl: "goodness/goodhistorylist",
+        //   showLoading: true,
+        //   data: {
+        //     wpId: that.wpId2,
+        //     wtId: that.wtId,
+        //     beginDate: that.beginDate,
+        //     endDate: that.endDate,
+        //   },
+        //   success(res) {
+        //     res.data.forEach((ele) => {
+        //       ele.time = new Date(ele.recorddate).formatDate("yyyy-MM-dd");
+        //     });
+        //     that.historyTableData.data = res.data;
+        //     that.dialogShow = true;
+        //   },
+        // });
       }
     },
 

src/views/powerRank/index.vue

@@ -78,6 +78,7 @@
 
 <script>
 import ComTable from "@com/coms/table/table.vue";
+import api from "@api/economic/index.js";
 export default {
   // 名称
   name: "cutAnalyse",
@@ -171,18 +172,25 @@ export default {
   methods: {
     // 请求服务
     requestData() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windfarmAllAjax",
-        data: {
-          type: that.typeId,
-        },
-        success(res) {
-          that.allWpArray = res.data;
-          that.renderWprray();
-        },
+      api.powercompareWindfarmAllAjax({
+         type: this.typeId,
+      }).then((res) => {
+      this.allWpArray = res.data;
+          this.renderWprray();
       });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   subUrl: "powercompare/windfarmAllAjax",
+      //   data: {
+      //     type: that.typeId,
+      //   },
+      //   success(res) {
+      //     that.allWpArray = res.data;
+      //     that.renderWprray();
+      //   },
+      // });
     },
 
     renderWprray() {
@@ -210,28 +218,48 @@ export default {
           msg: "类型与日期不可为空",
         });
       } else {
-        that.API.requestData({
-          method: "POST",
-          subUrl: "leaderboard/loadfactortoplist",
-          data: {
-            wpId: that.wpId,
-            type: that.typeId,
-            isAsc: that.isAsc,
-            beginDate: that.beginDate,
-            endDate: that.endDate,
+        api.leaderboardLoadfactortoplist({
+          wpId: this.wpId,
+            type: this.typeId,
+            isAsc: this.isAsc,
+            beginDate: this.beginDate,
+            endDate: this.endDate,
             orderByColumn: "",
-          },
-          success(res) {
-            res.data.forEach((ele) => {
+      }).then((res) => {
+         res.data.forEach((ele) => {
               ele.beginDate = new Date(ele.beginDate).formatDate("yyyy-MM-dd");
               ele.endDate = new Date(ele.beginDate).formatDate("yyyy-MM-dd");
             });
             res.data.sort((a, b) => {
               return b.power - a.power;
             });
-            that.tableData.data = res.data;
-          },
-        });
+            this.tableData.data = res.data;
+      });
+
+
+
+        // that.API.requestData({
+        //   method: "POST",
+        //   subUrl: "leaderboard/loadfactortoplist",
+        //   data: {
+        //     wpId: that.wpId,
+        //     type: that.typeId,
+        //     isAsc: that.isAsc,
+        //     beginDate: that.beginDate,
+        //     endDate: that.endDate,
+        //     orderByColumn: "",
+        //   },
+        //   success(res) {
+        //     res.data.forEach((ele) => {
+        //       ele.beginDate = new Date(ele.beginDate).formatDate("yyyy-MM-dd");
+        //       ele.endDate = new Date(ele.beginDate).formatDate("yyyy-MM-dd");
+        //     });
+        //     res.data.sort((a, b) => {
+        //       return b.power - a.power;
+        //     });
+        //     that.tableData.data = res.data;
+        //   },
+        // });
       }
     },
 

src/views/specific/fdl.vue

@@ -221,6 +221,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -313,19 +314,16 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/fdlList",
-        data: {
+
+      api
+        .specificFdlList({
           year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+        })
+        .then((res) => {
+              this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -350,18 +348,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -383,8 +381,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -403,7 +401,7 @@ export default {
             ],
           };
 
-          // _this.DayPower = {
+          // this.DayPower = {
           //   // 图表所用单位
           //   units: [""],
           //   value: [
@@ -419,13 +417,126 @@ export default {
           //     },
           //   ],
           // },
-          // _this.bardata.legend = ["本期", "同期"]
-          // _this.lineData = [];
-          // _this.bardata.area = monthData;
-          // _this.bardata.data[0] = sameCureent;
-          // _this.bardata.data[1] = nowCureent;
-        },
-      });
+          // this.bardata.legend = ["本期", "同期"]
+          // this.lineData = [];
+          // this.bardata.area = monthData;
+          // this.bardata.data[0] = sameCureent;
+          // this.bardata.data[1] = nowCureent;
+        });
+
+      // this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/fdlList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     this.MhsLists = MhsLists.sort(this.compare("month"));
+      //     this.NshList = NshList.sort(this.compare("month"));
+      //     this.QshList = QshList.sort(this.compare("month"));
+      //     this.SbaqList = SbaqList.sort(this.compare("month"));
+      //     this.XshList = XshList.sort(this.compare("month"));
+      //     this.GsList = GsList.sort(this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     this.monthData = monthsAll;
+      //     this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // this.bardata.legend = ["本期", "同期"]
+      //     // this.lineData = [];
+      //     // this.bardata.area = monthData;
+      //     // this.bardata.data[0] = sameCureent;
+      //     // this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/fnlyl.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -314,19 +315,14 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/fnlylList",
-        data: {
-          year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+
+      api.specificFnlylList({
+         year: year,
+      }).then((res) => {
+         this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -351,18 +347,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -384,8 +380,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -403,6 +399,98 @@ export default {
               },
             ],
           };
+      });
+
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/fnlylList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     _this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (_this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     _this.MhsLists = MhsLists.sort(_this.compare("month"));
+      //     _this.NshList = NshList.sort(_this.compare("month"));
+      //     _this.QshList = QshList.sort(_this.compare("month"));
+      //     _this.SbaqList = SbaqList.sort(_this.compare("month"));
+      //     _this.XshList = XshList.sort(_this.compare("month"));
+      //     _this.GsList = GsList.sort(_this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     _this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     _this.monthData = monthsAll;
+      //     _this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
 
           // _this.DayPower = {
           //   // 图表所用单位
@@ -425,8 +513,8 @@ export default {
           // _this.bardata.area = monthData;
           // _this.bardata.data[0] = sameCureent;
           // _this.bardata.data[1] = nowCureent;
-        },
-      });
+        // },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/fwjsl.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -314,19 +315,16 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/fwjslList",
-        data: {
+
+      api
+        .specificFwjslList({
           year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+        })
+        .then((res) => {
+            this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -351,18 +349,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -384,8 +382,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -404,7 +402,7 @@ export default {
             ],
           };
 
-          // _this.DayPower = {
+          // this.DayPower = {
           //   // 图表所用单位
           //   units: [""],
           //   value: [
@@ -420,13 +418,126 @@ export default {
           //     },
           //   ],
           // },
-          // _this.bardata.legend = ["本期", "同期"]
-          // _this.lineData = [];
-          // _this.bardata.area = monthData;
-          // _this.bardata.data[0] = sameCureent;
-          // _this.bardata.data[1] = nowCureent;
-        },
-      });
+          // this.bardata.legend = ["本期", "同期"]
+          // this.lineData = [];
+          // this.bardata.area = monthData;
+          // this.bardata.data[0] = sameCureent;
+          // this.bardata.data[1] = nowCureent;
+        });
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/fwjslList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     _this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (_this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     _this.MhsLists = MhsLists.sort(_this.compare("month"));
+      //     _this.NshList = NshList.sort(_this.compare("month"));
+      //     _this.QshList = QshList.sort(_this.compare("month"));
+      //     _this.SbaqList = SbaqList.sort(_this.compare("month"));
+      //     _this.XshList = XshList.sort(_this.compare("month"));
+      //     _this.GsList = GsList.sort(_this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     _this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     _this.monthData = monthsAll;
+      //     _this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // _this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // _this.bardata.legend = ["本期", "同期"]
+      //     // _this.lineData = [];
+      //     // _this.bardata.area = monthData;
+      //     // _this.bardata.data[0] = sameCureent;
+      //     // _this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/gzssl.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -314,19 +315,14 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/gzsslList",
-        data: {
-          year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+
+      api.specificGzsslList({
+         year: year,
+      }).then((res) => {
+           this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -351,18 +347,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -384,8 +380,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -425,8 +421,121 @@ export default {
           // _this.bardata.area = monthData;
           // _this.bardata.data[0] = sameCureent;
           // _this.bardata.data[1] = nowCureent;
-        },
       });
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/gzsslList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     _this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (_this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     _this.MhsLists = MhsLists.sort(_this.compare("month"));
+      //     _this.NshList = NshList.sort(_this.compare("month"));
+      //     _this.QshList = QshList.sort(_this.compare("month"));
+      //     _this.SbaqList = SbaqList.sort(_this.compare("month"));
+      //     _this.XshList = XshList.sort(_this.compare("month"));
+      //     _this.GsList = GsList.sort(_this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     _this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     _this.monthData = monthsAll;
+      //     _this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // _this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // _this.bardata.legend = ["本期", "同期"]
+      //     // _this.lineData = [];
+      //     // _this.bardata.area = monthData;
+      //     // _this.bardata.data[0] = sameCureent;
+      //     // _this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/mtbf.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -314,19 +315,14 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/mtbfList",
-        data: {
-          year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+
+      api.specificMtbfList({
+       year: year,
+      }).then((res) => {
+           this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -351,18 +347,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -384,8 +380,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -404,7 +400,7 @@ export default {
             ],
           };
 
-          // _this.DayPower = {
+          // this.DayPower = {
           //   // 图表所用单位
           //   units: [""],
           //   value: [
@@ -420,13 +416,128 @@ export default {
           //     },
           //   ],
           // },
-          // _this.bardata.legend = ["本期", "同期"]
-          // _this.lineData = [];
-          // _this.bardata.area = monthData;
-          // _this.bardata.data[0] = sameCureent;
-          // _this.bardata.data[1] = nowCureent;
-        },
+          // this.bardata.legend = ["本期", "同期"]
+          // this.lineData = [];
+          // this.bardata.area = monthData;
+          // this.bardata.data[0] = sameCureent;
+          // this.bardata.data[1] = nowCureent;
       });
+
+
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/mtbfList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     _this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (_this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     _this.MhsLists = MhsLists.sort(_this.compare("month"));
+      //     _this.NshList = NshList.sort(_this.compare("month"));
+      //     _this.QshList = QshList.sort(_this.compare("month"));
+      //     _this.SbaqList = SbaqList.sort(_this.compare("month"));
+      //     _this.XshList = XshList.sort(_this.compare("month"));
+      //     _this.GsList = GsList.sort(_this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     _this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     _this.monthData = monthsAll;
+      //     _this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // _this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // _this.bardata.legend = ["本期", "同期"]
+      //     // _this.lineData = [];
+      //     // _this.bardata.area = monthData;
+      //     // _this.bardata.data[0] = sameCureent;
+      //     // _this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/mttr.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -314,19 +315,14 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/mttrList",
-        data: {
-          year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+
+        api.specificMttrList({
+         year: year,
+      }).then((res) => {
+              this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -351,18 +347,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -384,8 +380,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -404,7 +400,7 @@ export default {
             ],
           };
 
-          // _this.DayPower = {
+          // this.DayPower = {
           //   // 图表所用单位
           //   units: [""],
           //   value: [
@@ -420,13 +416,128 @@ export default {
           //     },
           //   ],
           // },
-          // _this.bardata.legend = ["本期", "同期"]
-          // _this.lineData = [];
-          // _this.bardata.area = monthData;
-          // _this.bardata.data[0] = sameCureent;
-          // _this.bardata.data[1] = nowCureent;
-        },
+          // this.bardata.legend = ["本期", "同期"]
+          // this.lineData = [];
+          // this.bardata.area = monthData;
+          // this.bardata.data[0] = sameCureent;
+          // this.bardata.data[1] = nowCureent;
       });
+
+
+
+      // this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/mttrList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     this.MhsLists = MhsLists.sort(this.compare("month"));
+      //     this.NshList = NshList.sort(this.compare("month"));
+      //     this.QshList = QshList.sort(this.compare("month"));
+      //     this.SbaqList = SbaqList.sort(this.compare("month"));
+      //     this.XshList = XshList.sort(this.compare("month"));
+      //     this.GsList = GsList.sort(this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     this.monthData = monthsAll;
+      //     this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // this.bardata.legend = ["本期", "同期"]
+      //     // this.lineData = [];
+      //     // this.bardata.area = monthData;
+      //     // this.bardata.data[0] = sameCureent;
+      //     // this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/slssl.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -314,19 +315,16 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/slsslList",
-        data: {
+
+      api
+        .specificSlsslList({
           year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+        })
+        .then((res) => {
+           this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -351,18 +349,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -384,8 +382,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -404,7 +402,7 @@ export default {
             ],
           };
 
-          // _this.DayPower = {
+          // this.DayPower = {
           //   // 图表所用单位
           //   units: [""],
           //   value: [
@@ -420,13 +418,126 @@ export default {
           //     },
           //   ],
           // },
-          // _this.bardata.legend = ["本期", "同期"]
-          // _this.lineData = [];
-          // _this.bardata.area = monthData;
-          // _this.bardata.data[0] = sameCureent;
-          // _this.bardata.data[1] = nowCureent;
-        },
-      });
+          // this.bardata.legend = ["本期", "同期"]
+          // this.lineData = [];
+          // this.bardata.area = monthData;
+          // this.bardata.data[0] = sameCureent;
+          // this.bardata.data[1] = nowCureent;
+        });
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/slsslList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     _this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (_this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     _this.MhsLists = MhsLists.sort(_this.compare("month"));
+      //     _this.NshList = NshList.sort(_this.compare("month"));
+      //     _this.QshList = QshList.sort(_this.compare("month"));
+      //     _this.SbaqList = SbaqList.sort(_this.compare("month"));
+      //     _this.XshList = XshList.sort(_this.compare("month"));
+      //     _this.GsList = GsList.sort(_this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     _this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     _this.monthData = monthsAll;
+      //     _this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // _this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // _this.bardata.legend = ["本期", "同期"]
+      //     // _this.lineData = [];
+      //     // _this.bardata.area = monthData;
+      //     // _this.bardata.data[0] = sameCureent;
+      //     // _this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/whssl.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -314,20 +315,15 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/whsslList",
-        data: {
+
+        api.specificWhsslList({
           year: year,
-        },
-        success(res) {
-          console.log(res);
-          _this.list = res.data.map((item) => {
+      }).then((res) => {
+         console.log(res);
+          this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -352,18 +348,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -385,8 +381,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -404,30 +400,122 @@ export default {
               },
             ],
           };
-
-          // _this.DayPower = {
-          //   // 图表所用单位
-          //   units: [""],
-          //   value: [
-          //     {
-          //       title: "本期",
-          //       yAxisIndex: 0, // 使用单位
-          //       value: [],
-          //     },
-          //     {
-          //       title: "同期",
-          //       yAxisIndex: 0, // 使用单位
-          //       value: [],
-          //     },
-          //   ],
-          // },
-          // _this.bardata.legend = ["本期", "同期"]
-          // _this.lineData = [];
-          // _this.bardata.area = monthData;
-          // _this.bardata.data[0] = sameCureent;
-          // _this.bardata.data[1] = nowCureent;
-        },
       });
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/whsslList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     console.log(res);
+      //     _this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (_this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     _this.MhsLists = MhsLists.sort(_this.compare("month"));
+      //     _this.NshList = NshList.sort(_this.compare("month"));
+      //     _this.QshList = QshList.sort(_this.compare("month"));
+      //     _this.SbaqList = SbaqList.sort(_this.compare("month"));
+      //     _this.XshList = XshList.sort(_this.compare("month"));
+      //     _this.GsList = GsList.sort(_this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     _this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     _this.monthData = monthsAll;
+      //     _this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // _this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // _this.bardata.legend = ["本期", "同期"]
+      //     // _this.lineData = [];
+      //     // _this.bardata.area = monthData;
+      //     // _this.bardata.data[0] = sameCureent;
+      //     // _this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/xdssl.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -314,19 +315,16 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/xdsslList",
-        data: {
+
+      api
+        .specificXdsslList({
           year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+        })
+        .then((res) => {
+           this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -351,18 +349,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -384,8 +382,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -425,8 +423,122 @@ export default {
           // _this.bardata.area = monthData;
           // _this.bardata.data[0] = sameCureent;
           // _this.bardata.data[1] = nowCureent;
-        },
-      });
+        });
+
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/xdsslList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     _this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (_this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     _this.MhsLists = MhsLists.sort(_this.compare("month"));
+      //     _this.NshList = NshList.sort(_this.compare("month"));
+      //     _this.QshList = QshList.sort(_this.compare("month"));
+      //     _this.SbaqList = SbaqList.sort(_this.compare("month"));
+      //     _this.XshList = XshList.sort(_this.compare("month"));
+      //     _this.GsList = GsList.sort(_this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     _this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     _this.monthData = monthsAll;
+      //     _this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // _this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // _this.bardata.legend = ["本期", "同期"]
+      //     // _this.lineData = [];
+      //     // _this.bardata.area = monthData;
+      //     // _this.bardata.data[0] = sameCureent;
+      //     // _this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/xnssl.vue

@@ -314,19 +314,14 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/xnsslList",
-        data: {
-          year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+
+    api.specificXnsslList({
+         year: year,
+      }).then((res) => {
+         this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -351,18 +346,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -384,8 +379,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -425,8 +420,123 @@ export default {
           // _this.bardata.area = monthData;
           // _this.bardata.data[0] = sameCureent;
           // _this.bardata.data[1] = nowCureent;
-        },
       });
+
+
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/xnsslList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     _this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (_this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     _this.MhsLists = MhsLists.sort(_this.compare("month"));
+      //     _this.NshList = NshList.sort(_this.compare("month"));
+      //     _this.QshList = QshList.sort(_this.compare("month"));
+      //     _this.SbaqList = SbaqList.sort(_this.compare("month"));
+      //     _this.XshList = XshList.sort(_this.compare("month"));
+      //     _this.GsList = GsList.sort(_this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     _this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     _this.monthData = monthsAll;
+      //     _this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // _this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // _this.bardata.legend = ["本期", "同期"]
+      //     // _this.lineData = [];
+      //     // _this.bardata.area = monthData;
+      //     // _this.bardata.data[0] = sameCureent;
+      //     // _this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/xqjsl.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -314,19 +315,16 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/xqjslList",
-        data: {
+
+      api
+        .specificXqjslList({
           year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+        })
+        .then((res) => {
+                   this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -351,18 +349,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -384,8 +382,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -404,7 +402,7 @@ export default {
             ],
           };
 
-          // _this.DayPower = {
+          // this.DayPower = {
           //   // 图表所用单位
           //   units: [""],
           //   value: [
@@ -420,13 +418,126 @@ export default {
           //     },
           //   ],
           // },
-          // _this.bardata.legend = ["本期", "同期"]
-          // _this.lineData = [];
-          // _this.bardata.area = monthData;
-          // _this.bardata.data[0] = sameCureent;
-          // _this.bardata.data[1] = nowCureent;
-        },
-      });
+          // this.bardata.legend = ["本期", "同期"]
+          // this.lineData = [];
+          // this.bardata.area = monthData;
+          // this.bardata.data[0] = sameCureent;
+          // this.bardata.data[1] = nowCureent;
+        });
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/xqjslList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     _this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (_this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     _this.MhsLists = MhsLists.sort(_this.compare("month"));
+      //     _this.NshList = NshList.sort(_this.compare("month"));
+      //     _this.QshList = QshList.sort(_this.compare("month"));
+      //     _this.SbaqList = SbaqList.sort(_this.compare("month"));
+      //     _this.XshList = XshList.sort(_this.compare("month"));
+      //     _this.GsList = GsList.sort(_this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     _this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     _this.monthData = monthsAll;
+      //     _this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // _this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // _this.bardata.legend = ["本期", "同期"]
+      //     // _this.lineData = [];
+      //     // _this.bardata.area = monthData;
+      //     // _this.bardata.data[0] = sameCureent;
+      //     // _this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/zhcydl.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -314,19 +315,16 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/zhcydlList",
-        data: {
+
+      api
+        .specificZhcydlList({
           year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+        })
+        .then((res) => {
+          this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -351,18 +349,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -384,8 +382,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -404,7 +402,7 @@ export default {
             ],
           };
 
-          // _this.DayPower = {
+          // this.DayPower = {
           //   // 图表所用单位
           //   units: [""],
           //   value: [
@@ -420,13 +418,126 @@ export default {
           //     },
           //   ],
           // },
-          // _this.bardata.legend = ["本期", "同期"]
-          // _this.lineData = [];
-          // _this.bardata.area = monthData;
-          // _this.bardata.data[0] = sameCureent;
-          // _this.bardata.data[1] = nowCureent;
-        },
-      });
+          // this.bardata.legend = ["本期", "同期"]
+          // this.lineData = [];
+          // this.bardata.area = monthData;
+          // this.bardata.data[0] = sameCureent;
+          // this.bardata.data[1] = nowCureent;
+        });
+
+      // this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/zhcydlList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     this.MhsLists = MhsLists.sort(this.compare("month"));
+      //     this.NshList = NshList.sort(this.compare("month"));
+      //     this.QshList = QshList.sort(this.compare("month"));
+      //     this.SbaqList = SbaqList.sort(this.compare("month"));
+      //     this.XshList = XshList.sort(this.compare("month"));
+      //     this.GsList = GsList.sort(this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     this.monthData = monthsAll;
+      //     this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // _this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // _this.bardata.legend = ["本期", "同期"]
+      //     // _this.lineData = [];
+      //     // _this.bardata.area = monthData;
+      //     // _this.bardata.data[0] = sameCureent;
+      //     // _this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/specific/ztfx.vue

@@ -1661,6 +1661,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -1754,20 +1755,15 @@ export default {
       } else {
         months = this.monthChange(this.monthValue);
       }
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/maincenterlist",
-        data: {
+
+      api.specificMaincenterlist({
           month: months,
-        },
-        success(res) {
-          let currentMonth = {};
+      }).then((res) => {
+             let currentMonth = {};
           let currentYear = {};
           res.data["当月"].map((item) => {
             for (let key in item) {
-              if (_this.isNumber(item[key]) && key.indexOf("Compare") === -1) {
+              if (this.isNumber(item[key]) && key.indexOf("Compare") === -1) {
                 item[key] = item[key].toFixed(2);
               }
             }
@@ -1785,7 +1781,7 @@ export default {
           });
           res.data["当年"].map((item) => {
             for (let key in item) {
-              if (_this.isNumber(item[key]) && key.indexOf("Compare") === -1) {
+              if (this.isNumber(item[key]) && key.indexOf("Compare") === -1) {
                 item[key] = item[key].toFixed(2);
               }
             }
@@ -1801,10 +1797,63 @@ export default {
               currentYear["香山"] = item;
             }
           });
-          _this.currentMonth = currentMonth;
-          _this.currentYear = currentYear;
-        },
+          this.currentMonth = currentMonth;
+          this.currentYear = currentYear;
       });
+
+
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/maincenterlist",
+      //   data: {
+      //     month: months,
+      //   },
+      //   success(res) {
+      //     let currentMonth = {};
+      //     let currentYear = {};
+      //     res.data["当月"].map((item) => {
+      //       for (let key in item) {
+      //         if (_this.isNumber(item[key]) && key.indexOf("Compare") === -1) {
+      //           item[key] = item[key].toFixed(2);
+      //         }
+      //       }
+      //       if (item.wpid === "麻黄山风电场") {
+      //         currentMonth["麻黄山"] = item;
+      //       } else if (item.wpid === "牛首山风电场") {
+      //         currentMonth["牛首山"] = item;
+      //       } else if (item.wpid === "青山风电场") {
+      //         currentMonth["青山"] = item;
+      //       } else if (item.wpid === "石板泉风电场") {
+      //         currentMonth["石板泉"] = item;
+      //       } else if (item.wpid === "香山风电场") {
+      //         currentMonth["香山"] = item;
+      //       }
+      //     });
+      //     res.data["当年"].map((item) => {
+      //       for (let key in item) {
+      //         if (_this.isNumber(item[key]) && key.indexOf("Compare") === -1) {
+      //           item[key] = item[key].toFixed(2);
+      //         }
+      //       }
+      //       if (item.wpid === "麻黄山风电场") {
+      //         currentYear["麻黄山"] = item;
+      //       } else if (item.wpid === "牛首山风电场") {
+      //         currentYear["牛首山"] = item;
+      //       } else if (item.wpid === "青山风电场") {
+      //         currentYear["青山"] = item;
+      //       } else if (item.wpid === "石板泉风电场") {
+      //         currentYear["石板泉"] = item;
+      //       } else if (item.wpid === "香山风电场") {
+      //         currentYear["香山"] = item;
+      //       }
+      //     });
+      //     _this.currentMonth = currentMonth;
+      //     _this.currentYear = currentYear;
+      //   },
+      // });
     },
     getMonthList(showLoading) {
       let _this = this;
@@ -1814,24 +1863,19 @@ export default {
       } else {
         months = this.monthChange(this.monthValue);
       }
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/maintoplist",
-        data: {
-          month: months,
-        },
-        success(res) {
-          res.data.map((item) => {
+
+        api.specificMaintoplist({
+        month: months,
+      }).then((res) => {
+           res.data.map((item) => {
             for (let key in item) {
-              if (_this.isNumber(item[key]) && item.type !== "比较") {
+              if (this.isNumber(item[key]) && item.type !== "比较") {
                 item[key] = item[key].toFixed(2);
               }
             }
             if (item.type === "本期") {
-              _this.nowCurrents = item;
-              _this.innerDataCurentsChart = [
+              this.nowCurrents = item;
+              this.innerDataCurentsChart = [
                 {
                   value: item.ywhssl,
                   name: "维护损失率",
@@ -1858,7 +1902,7 @@ export default {
                 },
               ];
 
-              _this.innerDataCurentsYearChart = [
+              this.innerDataCurentsYearChart = [
                 {
                   value: item.nwhssl,
                   name: "维护损失率",
@@ -1885,10 +1929,10 @@ export default {
                 },
               ];
             } else if (item.type === "比较") {
-              _this.compares = item;
+              this.compares = item;
             } else {
-              _this.sameList = item;
-              _this.innerDataSameChart = [
+              this.sameList = item;
+              this.innerDataSameChart = [
                 {
                   value: item.ywhssl,
                   name: "维护损失率",
@@ -1914,7 +1958,7 @@ export default {
                   name: "风能利用率",
                 },
               ];
-              _this.innerDataSameYearChart = [
+              this.innerDataSameYearChart = [
                 {
                   value: item.nwhssl,
                   name: "维护损失率",
@@ -1942,8 +1986,141 @@ export default {
               ];
             }
           });
-        },
       });
+
+
+
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/maintoplist",
+      //   data: {
+      //     month: months,
+      //   },
+      //   success(res) {
+      //     res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (_this.isNumber(item[key]) && item.type !== "比较") {
+      //           item[key] = item[key].toFixed(2);
+      //         }
+      //       }
+      //       if (item.type === "本期") {
+      //         _this.nowCurrents = item;
+      //         _this.innerDataCurentsChart = [
+      //           {
+      //             value: item.ywhssl,
+      //             name: "维护损失率",
+      //           },
+      //           {
+      //             value: item.ygzssl,
+      //             name: "故障损失率",
+      //           },
+      //           {
+      //             value: item.yxdssl,
+      //             name: "限电损失率",
+      //           },
+      //           {
+      //             value: item.yxnssl,
+      //             name: "性能损失率",
+      //           },
+      //           {
+      //             value: item.yslssl,
+      //             name: "受累损失率",
+      //           },
+      //           {
+      //             value: item.yfnlyl,
+      //             name: "风能利用率",
+      //           },
+      //         ];
+
+      //         _this.innerDataCurentsYearChart = [
+      //           {
+      //             value: item.nwhssl,
+      //             name: "维护损失率",
+      //           },
+      //           {
+      //             value: item.ngzssl,
+      //             name: "故障损失率",
+      //           },
+      //           {
+      //             value: item.nxdssl,
+      //             name: "限电损失率",
+      //           },
+      //           {
+      //             value: item.nxnssl,
+      //             name: "性能损失率",
+      //           },
+      //           {
+      //             value: item.nslssl,
+      //             name: "受累损失率",
+      //           },
+      //           {
+      //             value: item.nfnlyl,
+      //             name: "风能利用率",
+      //           },
+      //         ];
+      //       } else if (item.type === "比较") {
+      //         _this.compares = item;
+      //       } else {
+      //         _this.sameList = item;
+      //         _this.innerDataSameChart = [
+      //           {
+      //             value: item.ywhssl,
+      //             name: "维护损失率",
+      //           },
+      //           {
+      //             value: item.ygzssl,
+      //             name: "故障损失率",
+      //           },
+      //           {
+      //             value: item.yxdssl,
+      //             name: "限电损失率",
+      //           },
+      //           {
+      //             value: item.yxnssl,
+      //             name: "性能损失率",
+      //           },
+      //           {
+      //             value: item.yslssl,
+      //             name: "受累损失率",
+      //           },
+      //           {
+      //             value: item.yfnlyl,
+      //             name: "风能利用率",
+      //           },
+      //         ];
+      //         _this.innerDataSameYearChart = [
+      //           {
+      //             value: item.nwhssl,
+      //             name: "维护损失率",
+      //           },
+      //           {
+      //             value: item.ngzssl,
+      //             name: "故障损失率",
+      //           },
+      //           {
+      //             value: item.nxdssl,
+      //             name: "限电损失率",
+      //           },
+      //           {
+      //             value: item.nxnssl,
+      //             name: "性能损失率",
+      //           },
+      //           {
+      //             value: item.nslssl,
+      //             name: "受累损失率",
+      //           },
+      //           {
+      //             value: item.nfnlyl,
+      //             name: "风能利用率",
+      //           },
+      //         ];
+      //       }
+      //     });
+      //   },
+      // });
     },
   },
 };

src/views/specific/ztzhl.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {
@@ -314,19 +315,16 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-      _this.API.requestData({
-        showLoading,
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034",
-        subUrl: "/specific/ztzhlList",
-        data: {
-          year: year,
-        },
-        success(res) {
-          _this.list = res.data.map((item) => {
+
+
+
+api.specificZtzhlList({
+         year: year,
+      }).then((res) => {
+          this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
-                if (_this.isNumber(item[key])) {
+                if (this.isNumber(item[key])) {
                   item[key] = item[key].toFixed(2);
                 } else if (!item[key]) {
                   item[key] = 0;
@@ -351,18 +349,18 @@ export default {
             }
           });
 
-          _this.MhsLists = MhsLists.sort(_this.compare("month"));
-          _this.NshList = NshList.sort(_this.compare("month"));
-          _this.QshList = QshList.sort(_this.compare("month"));
-          _this.SbaqList = SbaqList.sort(_this.compare("month"));
-          _this.XshList = XshList.sort(_this.compare("month"));
-          _this.GsList = GsList.sort(_this.compare("month"));
+          this.MhsLists = MhsLists.sort(this.compare("month"));
+          this.NshList = NshList.sort(this.compare("month"));
+          this.QshList = QshList.sort(this.compare("month"));
+          this.SbaqList = SbaqList.sort(this.compare("month"));
+          this.XshList = XshList.sort(this.compare("month"));
+          this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
           let monthData = [];
           let monthsAll = [];
-          _this.GsList.map((item) => {
+          this.GsList.map((item) => {
             let objs = {};
             let obj = {};
             monthsAll.push(item.month);
@@ -384,8 +382,8 @@ export default {
               }
             }
           });
-          _this.monthData = monthsAll;
-          _this.DayPower = {
+          this.monthData = monthsAll;
+          this.DayPower = {
             // 图表所用单位
             units: [""],
             value: [
@@ -404,7 +402,7 @@ export default {
             ],
           };
 
-          // _this.DayPower = {
+          // this.DayPower = {
           //   // 图表所用单位
           //   units: [""],
           //   value: [
@@ -420,13 +418,128 @@ export default {
           //     },
           //   ],
           // },
-          // _this.bardata.legend = ["本期", "同期"]
-          // _this.lineData = [];
-          // _this.bardata.area = monthData;
-          // _this.bardata.data[0] = sameCureent;
-          // _this.bardata.data[1] = nowCureent;
-        },
+          // this.bardata.legend = ["本期", "同期"]
+          // this.lineData = [];
+          // this.bardata.area = monthData;
+          // this.bardata.data[0] = sameCureent;
+          // this.bardata.data[1] = nowCureent;
       });
+
+
+
+      // _this.API.requestData({
+      //   showLoading,
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034",
+      //   subUrl: "/specific/ztzhlList",
+      //   data: {
+      //     year: year,
+      //   },
+      //   success(res) {
+      //     _this.list = res.data.map((item) => {
+      //       for (let key in item) {
+      //         if (!site.includes(key)) {
+      //           if (_this.isNumber(item[key])) {
+      //             item[key] = item[key].toFixed(2);
+      //           } else if (!item[key]) {
+      //             item[key] = 0;
+      //             item[key] = item[key].toFixed(2);
+      //           }
+      //         }
+      //       }
+      //       if (item.wpid === "MHS_FDC") {
+      //         MhsLists.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "QS_FDC") {
+      //         QshList.push(item);
+      //       } else if (item.wpid === "NSS_FDC") {
+      //         NshList.push(item);
+      //       } else if (item.wpid === "SBQ_FDC") {
+      //         SbaqList.push(item);
+      //       } else if (item.wpid === "XS_FDC") {
+      //         XshList.push(item);
+      //       } else {
+      //         GsList.push(item);
+      //       }
+      //     });
+
+      //     _this.MhsLists = MhsLists.sort(_this.compare("month"));
+      //     _this.NshList = NshList.sort(_this.compare("month"));
+      //     _this.QshList = QshList.sort(_this.compare("month"));
+      //     _this.SbaqList = SbaqList.sort(_this.compare("month"));
+      //     _this.XshList = XshList.sort(_this.compare("month"));
+      //     _this.GsList = GsList.sort(_this.compare("month"));
+
+      //     let nowCureent = [];
+      //     let sameCureent = [];
+      //     let monthData = [];
+      //     let monthsAll = [];
+      //     _this.GsList.map((item) => {
+      //       let objs = {};
+      //       let obj = {};
+      //       monthsAll.push(item.month);
+      //       if (item.month > 10) {
+      //         objs.text = item.month.toString();
+      //         obj.text = item.month.toString();
+      //       } else {
+      //         item.text = "0" + item.month;
+      //         objs.text = item.text;
+      //         obj.text = item.text;
+      //       }
+      //       for (let key in item) {
+      //         if (key === "current") {
+      //           objs.value = item.current;
+      //           nowCureent.push(objs);
+      //         } else if (key === "sameperiod") {
+      //           obj.value = item.sameperiod;
+      //           sameCureent.push(obj);
+      //         }
+      //       }
+      //     });
+      //     _this.monthData = monthsAll;
+      //     _this.DayPower = {
+      //       // 图表所用单位
+      //       units: [""],
+      //       value: [
+      //         {
+      //           title: "本期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: nowCureent,
+      //           // nowCureent
+      //         },
+      //         {
+      //           title: "同期",
+      //           yAxisIndex: 0, // 使用单位
+      //           value: sameCureent,
+      //           // sameCureent
+      //         },
+      //       ],
+      //     };
+
+      //     // _this.DayPower = {
+      //     //   // 图表所用单位
+      //     //   units: [""],
+      //     //   value: [
+      //     //     {
+      //     //       title: "本期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //     {
+      //     //       title: "同期",
+      //     //       yAxisIndex: 0, // 使用单位
+      //     //       value: [],
+      //     //     },
+      //     //   ],
+      //     // },
+      //     // _this.bardata.legend = ["本期", "同期"]
+      //     // _this.lineData = [];
+      //     // _this.bardata.area = monthData;
+      //     // _this.bardata.data[0] = sameCureent;
+      //     // _this.bardata.data[1] = nowCureent;
+      //   },
+      // });
     },
     compare(property) {
       return (a, b) => {

src/views/totalPowerRank/index.vue

@@ -80,6 +80,7 @@
 
 <script>
 import ComTable from "@com/coms/table/table.vue";
+import api from "@api/economic/index.js";
 export default {
   // 名称
   name: "cutAnalyse",
@@ -156,15 +157,10 @@ export default {
   methods: {
     // 请求服务
     requestData() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windfarmAllAjax",
-        data: {
-          type: that.typeId,
-        },
-        success(res) {
-          that.allWpArray = res.data;
+api.powercompareWindfarmAllAjax({
+          type: this.typeId,
+      }).then((res) => {
+          this.allWpArray = res.data;
           let fdc = [];
           let gf = [];
 
@@ -175,7 +171,7 @@ export default {
               gf.push(ele.id);
             }
           });
-          that.typeArray = [
+          this.typeArray = [
             {
               id: [].concat(fdc, gf).toString(),
               name: "全部",
@@ -189,10 +185,48 @@ export default {
               name: "光伏电站",
             },
           ];
-          that.wpIps = [].concat(fdc, gf).toString();
-          that.renderWprray();
-        },
+          this.wpIps = [].concat(fdc, gf).toString();
+          this.renderWprray();
       });
+
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   subUrl: "powercompare/windfarmAllAjax",
+      //   data: {
+      //     type: that.typeId,
+      //   },
+      //   success(res) {
+      //     that.allWpArray = res.data;
+      //     let fdc = [];
+      //     let gf = [];
+
+      //     res.data.forEach((ele) => {
+      //       if (ele.id.indexOf("FDC") !== -1) {
+      //         fdc.push(ele.id);
+      //       } else {
+      //         gf.push(ele.id);
+      //       }
+      //     });
+      //     that.typeArray = [
+      //       {
+      //         id: [].concat(fdc, gf).toString(),
+      //         name: "全部",
+      //       },
+      //       {
+      //         id: fdc.toString(),
+      //         name: "风场",
+      //       },
+      //       {
+      //         id: gf.toString(),
+      //         name: "光伏电站",
+      //       },
+      //     ];
+      //     that.wpIps = [].concat(fdc, gf).toString();
+      //     that.renderWprray();
+      //   },
+      // });
     },
 
     renderWprray() {
@@ -230,24 +264,15 @@ export default {
           msg: "日期不可为空",
         });
       } else {
-        that.API.requestData({
-          method: "GET",
-          subUrl: "leaderboard/totalPowerCapacityTopList",
-		  showLoading: true,
-          data: {
-            wpIps: that.wpId.length ? that.wpId.toString() : that.wpIps,
-            isAsc: that.isAsc,
-            beginDate: that.beginDate + "-01",
-            endDate:
-              that.endDate +
-              "-" +
-              (new Date().getDate() < 10
-                ? "0" + new Date().getDate()
-                : new Date().getDate()),
+
+        api.leaderboardTotalPowerCapacityTopList({
+       wpIps: this.wpId.length ? this.wpId.toString() : this.wpIps,
+            isAsc: this.isAsc,
+            beginDate: this.beginDate + "-01",
+            endDate:this.endDate + "-" + (new Date().getDate() < 10? "0" + new Date().getDate(): new Date().getDate()),
             orderByColumn: "",
-          },
-          success(res) {
-            res.data.forEach((ele) => {
+      }).then((res) => {
+      res.data.forEach((ele) => {
               ele.beginDate = new Date(ele.beginDate).formatDate("yyyy-MM-dd");
               ele.endDate = new Date(ele.beginDate).formatDate("yyyy-MM-dd");
 			  ele.speed = ele.speed.toFixed(2);
@@ -255,9 +280,35 @@ export default {
             res.data.sort((a, b) => {
               return b.power - a.power;
             });
-            that.tableData.data = res.data;
-          },
-        });
+            this.tableData.data = res.data;
+      });
+
+
+
+
+      //   that.API.requestData({
+      //     method: "GET",
+      //     subUrl: "leaderboard/totalPowerCapacityTopList",
+		  // showLoading: true,
+      //     data: {
+      //       wpIps: that.wpId.length ? that.wpId.toString() : that.wpIps,
+      //       isAsc: that.isAsc,
+      //       beginDate: that.beginDate + "-01",
+      //       endDate:that.endDate + "-" + (new Date().getDate() < 10? "0" + new Date().getDate(): new Date().getDate()),
+      //       orderByColumn: "",
+      //     },
+      //     success(res) {
+      //       res.data.forEach((ele) => {
+      //         ele.beginDate = new Date(ele.beginDate).formatDate("yyyy-MM-dd");
+      //         ele.endDate = new Date(ele.beginDate).formatDate("yyyy-MM-dd");
+			//   ele.speed = ele.speed.toFixed(2);
+      //       });
+      //       res.data.sort((a, b) => {
+      //         return b.power - a.power;
+      //       });
+      //       that.tableData.data = res.data;
+      //     },
+      //   });
       }
     },
 

src/views/warningRank/index.vue

@@ -70,6 +70,7 @@
 <script>
 import ComTable from "@com/coms/table/table.vue";
 import Lbc from "@com/chart/bar/multiple-bar-chart.vue";
+import api from "@api/economic/index.js";
 export default {
   // 名称
   name: "cutAnalyse",
@@ -154,20 +155,16 @@ export default {
           msg: "维度与日期不可为空",
         });
       } else {
-        that.API.requestData({
-          method: "POST",
-          subUrl: "leaderboard/querywarningStatistical",
-          data: {
-            type: that.typeId,
-            isAsc: that.isAsc,
-            beginDate: that.beginDate,
-            endDate: that.endDate,
+
+        api.leaderboardQuerywarningStatistical({
+         type: this.typeId,
+            isAsc: this.isAsc,
+            beginDate: this.beginDate,
+            endDate: this.endDate,
             orderByColumn: "",
-          },
-          success(res) {
-            let chartData = [];
-			let data = [];
-			let i = 1;
+      }).then((res) => {
+           let chartData = [];
+
             res.data.forEach((ele, index) => {
 				if(ele.name != null){
 					ele.index = i++;
@@ -184,10 +181,43 @@ export default {
 					});
 				}
             });
-            that.chartData = chartData;
-            that.tableData.data = data;
-          },
-        });
+
+            this.chartData = chartData;
+            this.tableData.data = res.data;
+      });
+
+
+        // that.API.requestData({
+        //   method: "POST",
+        //   subUrl: "leaderboard/querywarningStatistical",
+        //   data: {
+        //     type: that.typeId,
+        //     isAsc: that.isAsc,
+        //     beginDate: that.beginDate,
+        //     endDate: that.endDate,
+        //     orderByColumn: "",
+        //   },
+        //   success(res) {
+        //     let chartData = [];
+
+        //     res.data.forEach((ele, index) => {
+        //       ele.index = index + 1;
+        //       chartData.push({
+        //         title: ele.name,
+        //         yAxisIndex: 0,
+        //         value: [
+        //           {
+        //             text: ele.name,
+        //             value: ele.frequencyday,
+        //           },
+        //         ],
+        //       });
+        //     });
+
+        //     that.chartData = chartData;
+        //     that.tableData.data = res.data;
+        //   },
+        // });
       }
     },