update

.env.development

@@ -1 +1 @@
-VUE_APP_API=http://10.83.66.220:8020
+VUE_APP_API=http://10.83.68.97:8020

src/api/economic/index.js

@@ -2,10 +2,8 @@ import request from "../../tools/request";
 //风机绩效榜
 const benchmarking = (data) => {
     return request({
-        baseURL:process.env.VUE_APP_API,
-        url: `/consumer/benchmarking/fjjxb`,
+        url: `/consumer/benchmarking/fjjxb?wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&type=${data.type}&target=${data.target}&sort=${data.sort}`,
         method: "get",
-        data: data,
     });
 };
 const benchmarkingLineList = (data) => {
@@ -29,91 +27,80 @@ const benchmarkingProjectList = (data) => {
 // *************************  NewPages  power-benchmarking.vue
 const benchmarkingDbmainbottom = (data) => {
     return request({
-        url: `benchmarking/dbmainbottom?timetype=${data.timetype}&foreigntype=${data.foreigntype}`,
+        url: `/consumer/benchmarking/dbmainbottom?timetype=${data.timetype}&foreigntype=${data.foreigntype}`,
         method: "get",
     });
 };
 const benchmarkingDbmaintop = (data) => {
     return request({
-        url: `benchmarking/dbmaintop?timetype=${data.timetype}&foreigntype=${data.foreigntype}`,
+        url: `/consumer/benchmarking/dbmaintop?timetype=${data.timetype}&foreigntype=${data.foreigntype}`,
         method: "get",
     });
 };
 // 节能减排KPI
 const targetdataJnjpkpi = (data) => {
     return request({
-        url: `targetdata/jnjpkpi?month=${data.month}`,
+        url: `/consumer/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}`,
+        url: `/consumer/benchmarking/wplist`,
         method: "get",
     });
 };
+
 const benchmarkingLineList1 = (data) => {
     return request({
-        url: `benchmarking/lineList?month=${data.projects}`,
+        url: `/consumer/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}`,
+        url: `/consumer/benchmarking/details?id=${data.id}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
         method: "get",
     });
 };
-const benchmarkingWplist2 = (data) => {
+const benchmarkingWplist2 = () => {
     return request({
-        url: `benchmarking/wplist`,
-        method: "get",
-    });
-};
-const benchmarkingProjectList2 = (data) => {
-    return request({
-        url: `benchmarking/projectList?wpids=${data.wpids}`,
+        url: `/consumer/benchmarking/wplist`,
         method: "get",
     });
 };
 const benchmarkingLineList2 = (data) => {
     return request({
-        url: `benchmarking/lineList?projects=${data.projects}`,
+        url: `/consumer/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}`,
+        url: `/consumer/benchmarking/wxssl?wpids=${data.wpids}&projectids=${data.projectids}&lineids=${data.lineids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
         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}`,
+        url: `/consumer/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}`,
+        url: `/consumer/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}`,
+        url: `/consumer/benchmarking/xmdb?wpids=${data.wpids}&projectids=${data.projectids}&beginDate=${data.beginDate}&endDate=${data.endDate}&target=${data.target}&sort=${data.sort}`,
         method: "get",
     });
 };
@@ -121,18 +108,16 @@ const benchmarkingXmdb = (data) => {
 //线路对标
 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}`,
+        url: `/consumer/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}`,
+        url: `/consumer/benchmarking/zjwxssl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
         method: "get",
     });
 };
@@ -140,14 +125,14 @@ const benchmarkingZjwxssl = (data) => {
 //操作指令统计
 const benchmarkingZjlist = (data) => {
     return request({
-        url: `benchmarking/zjlist?beginDate=${data.beginDate}&endDate=${data.endDate}`,
+        url: `/consumer/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}`,
+        url: `/consumer/benchmarking/zjdrill?beginDate=${data.beginDate}&endDate=${data.endDate}&dutyname=${data.dutyname}&direct=${data.direct}`,
         method: "get",
     });
 };
@@ -156,20 +141,21 @@ const benchmarkingZjdrill = (data) => {
 
 const benchmarkingWtList = (data) => {
     return request({
-        url: `benchmarking/wtList?wpids=${data.wpids}`,
+        url: `/consumer/benchmarking/wtList?wpid=${data.wpid}`,
         method: "get",
     });
 };
 
 const ajaxName = (data) => {
+    console.log(2222);
     return request({
-        url: `benchmarking/${data.ajaxName}?wpids=${data.wpids}&wtids=${data.wtids}&date=${data.date}&target=${data.target}&sort=${data.sort}`,
+        url: `/consumer/benchmarking/${data.ajaxName}?wpid=${data.wpid}&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}`,
+        url: `/consumer/benchmarking/djhxdbbottom?wpid=${data.wpid}&wtids=${data.wtids}&date=${data.date}`,
         method: "get",
     });
 };
@@ -177,21 +163,21 @@ const benchmarkingDjhxdbbottom = (data) => {
 // 三率管理/复位及时率
 const threerateFwjsl = (data) => {
     return request({
-        url: `/threerate/fwjsl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
+        url: `/consumer//threerate/fwjsl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
         method: "get",
     });
 };
 // 三率管理/状态转换率
 const threerateZtzhl = (data) => {
     return request({
-        url: `threerate/ztzhl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
+        url: `/consumer/threerate/ztzhl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
         method: "get",
     });
 };
 // 三率管理/消缺及时率
 const threerateXqjsl = (data) => {
     return request({
-        url: `threerate/xqjsl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
+        url: `/consumer/threerate/xqjsl?beginDate=${data.beginDate}&endDate=${data.endDate}`,
         method: "get",
     });
 };
@@ -199,14 +185,14 @@ const threerateXqjsl = (data) => {
 // 发电效率排行
 const powercompareWindfarmAllAjax = (data) => {
     return request({
-        url: `powercompare/windfarmAllAjax?type=${data.type}`,
+        url: `/consumer/powercompare/windfarmAllAjax?type=${data.type}`,
         method: "get",
     });
 };
 
 const leaderboardLoadfactortoplist = (data) => {
     return request({
-        url: `leaderboard/loadfactortoplist`,
+        url: `/consumer/leaderboard/loadfactortoplist`,
         method: "post",
         data:data
     });
@@ -214,14 +200,14 @@ const leaderboardLoadfactortoplist = (data) => {
 // 总发电效率排行
 const leaderboardTotalPowerCapacityTopList = (data) => {
     return request({
-        url: `leaderboard/totalPowerCapacityTopList?wpIps=${data.wpIps}&isAsc=${data.isAsc}&beginDate=${data.beginDate}&endDate=${data.endDate}&orderByColumn=${data.orderByColumn}`,
+        url: `/consumer/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`,
+        url: `/consumer/leaderboard/querywarningStatistical`,
         method: "post",
         data:data
     });
@@ -229,20 +215,20 @@ const leaderboardQuerywarningStatistical = (data) => {
 // 专题分析
 const  specificMaincenterlist = (data) => {
     return request({
-        url: `/specific/maincenterlist?month=${data.month}`,
+        url: `/consumer/specific/maincenterlist?month=${data.month}`,
         method: "get",
     });
 };
 const  specificMaintoplist = (data) => {
     return request({
-        url: `/specific/maintoplist?month=${data.month}`,
+        url: `/consumer/specific/maintoplist?month=${data.month}`,
         method: "get",
     });
 };
 // 风能利用率
 const  specificFnlylList = (data) => {
     return request({
-        url: `/specific/fnlylList?year=${data.year}`,
+        url: `/consumer/specific/fnlylList?year=${data.year}`,
         method: "get",
     });
 };
@@ -250,14 +236,14 @@ const  specificFnlylList = (data) => {
 // 维护损失率
 const  specificWhsslList = (data) => {
     return request({
-        url: `/specific/fnlylList?year=${data.year}`,
+        url: `/consumer/specific/fnlylList?year=${data.year}`,
         method: "get",
     });
 };
  // 故障损失率
  const  specificGzsslList = (data) => {
     return request({
-        url: `/specific/gzsslList?year=${data.year}`,
+        url: `/consumer/specific/gzsslList?year=${data.year}`,
         method: "get",
     });
 };
@@ -265,7 +251,7 @@ const  specificWhsslList = (data) => {
 // 限电损失率
 const  specificXdsslList = (data) => {
     return request({
-        url: `/specific/xdsslList?year=${data.year}`,
+        url: `/consumer/specific/xdsslList?year=${data.year}`,
         method: "get",
     });
 };
@@ -273,7 +259,7 @@ const  specificXdsslList = (data) => {
 // 性能损失率
 const  specificXnsslList = (data) => {
     return request({
-        url: `/specific/xnsslList?year=${data.year}`,
+        url: `/consumer/specific/xnsslList?year=${data.year}`,
         method: "get",
     });
 };
@@ -281,14 +267,14 @@ const  specificXnsslList = (data) => {
 // 受累损失率
 const  specificSlsslList = (data) => {
     return request({
-        url: `/specific/slsslList?year=${data.year}`,
+        url: `/consumer/specific/slsslList?year=${data.year}`,
         method: "get",
     });
 };
 // mtbf
 const  specificMtbfList = (data) => {
     return request({
-        url: `/specific/mtbfList?year=${data.year}`,
+        url: `/consumer/specific/mtbfList?year=${data.year}`,
         method: "get",
     });
 };
@@ -296,21 +282,21 @@ const  specificMtbfList = (data) => {
  // mttr
  const  specificMttrList = (data) => {
     return request({
-        url: `/specific/mttrList?year=${data.year}`,
+        url: `/consumer/specific/mttrList?year=${data.year}`,
         method: "get",
     });
 };
 // 复位及时率
 const  specificFwjslList = (data) => {
     return request({
-        url: `/specific/fwjslList?year=${data.year}`,
+        url: `/consumer/specific/fwjslList?year=${data.year}`,
         method: "get",
     });
 };
 // 状态转换率
 const  specificZtzhlList = (data) => {
     return request({
-        url: `/specific/ztzhlList?year=${data.year}`,
+        url: `/consumer/specific/ztzhlList?year=${data.year}`,
         method: "get",
     });
 };
@@ -318,34 +304,34 @@ const  specificZtzhlList = (data) => {
  // 消缺及时率
  const  specificXqjslList = (data) => {
     return request({
-        url: `/specific/xqjslList?year=${data.year}`,
+        url: `/consumer/specific/xqjslList?year=${data.year}`,
         method: "get",
     });
 };
 // 发电量分析
 const  specificFdlList = (data) => {
     return request({
-        url: `/specific/fdlList?year=${data.year}`,
+        url: `/consumer/specific/fdlList?year=${data.year}`,
         method: "get",
     });
 };
 // 综合场用电量
 const  specificZhcydlList = (data) => {
     return request({
-        url: `/specific/zhcydlList?year=${data.year}`,
+        url: `/consumer/specific/zhcydlList?year=${data.year}`,
         method: "get",
     });
 };
 // 单机信息总览
 const  powercompareWindfarmAjax = (data) => {
     return request({
-        url: `powercompare/windfarmAjax`,
+        url: `/consumer/powercompare/windfarmAjax`,
         method: "get",
     });
 };
 const  goodnessWindturbinegoodness = (data) => {
     return request({
-        url: `goodness/windturbinegoodness`,
+        url: `/consumer/goodness/windturbinegoodness`,
         method: "post",
         data:data
     });
@@ -353,14 +339,14 @@ const  goodnessWindturbinegoodness = (data) => {
 
 const  powercompareWindturbineAjax = (data) => {
     return request({
-        url: `powercompare/windturbineAjax?wpId=${data.wpId}`,
+        url: `/consumer/powercompare/windturbineAjax?wpId=${data.wpId}`,
         method: "get",
     });
 };
 
 const  goodnessGoodhistorylist = (data) => {
     return request({
-        url: `goodness/goodhistorylist`,
+        url: `/consumer/goodness/goodhistorylist`,
         method: "post",
         data:data
     });
@@ -369,14 +355,14 @@ const  goodnessGoodhistorylist = (data) => {
 
 const  goodnessFindWtRealPowerChar = (data) => {
     return request({
-        url: `goodness/findWtRealPowerChar`,
+        url: `/consumer/goodness/findWtRealPowerChar`,
         method: "post",
         data:data
     });
 };
 const  goodnessGetplotBands = (data) => {
     return request({
-        url: `goodness/getplotBands`,
+        url: `/consumer/goodness/getplotBands`,
         method: "post",
         data:data
     });
@@ -397,11 +383,9 @@ export default {
     benchmarkingDbmaintop,
     targetdataJnjpkpi,
     benchmarkingWplist1,
-    benchmarkingProjectList1,
     benchmarkingLineList1,
     benchmarkingDetails,
     benchmarkingWplist2,
-    benchmarkingProjectList2,
     benchmarkingLineList2,
     benchmarkingWxssl,
     benchmarkingCndb,
@@ -441,5 +425,6 @@ export default {
     goodnessGoodhistorylist,
     powercompareWindfarmAjax,
     goodnessFindWtRealPowerChar,
-    goodnessGetplotBands
+    goodnessGetplotBands,
+    ajaxName
 }

src/components/chart/line/double-line-chart.vue

@@ -159,7 +159,7 @@ export default {
       }
     },
     xdata() {
-      return this.newlist[0].value.map((t) => {
+      return this.newlist[0]?.value.map((t) => {
         return t.text;
       });
     },

src/tools/request.js

@@ -9,17 +9,14 @@ service.interceptors.request.use(
 		config.headers = {
 			// Authorization: store.state.token,
 		}
+		// 统一格式包装请求参数
 		return config;
 	},
 	error => {
 		return Promise.reject(error);
 	}
 );
-// 统一格式包装请求参数
-// let params = new URLSearchParams();
-// for (let key in (options.data || {})) {
-//   params.append(key, options.data[key]);
-// }
+
 service.interceptors.response.use(
 	// Loading.close(),
 	response => {
@@ -29,7 +26,7 @@ service.interceptors.response.use(
 			status === 200
 		) {
 
-			return response;
+			return response.data;
 		} else {
 
 			return false;

src/views/Decision/Decision1.vue

@@ -318,6 +318,7 @@ export default {
   },
   methods: {
     ChangZhanVal() {
+      console.log(11111111);
       api.benchmarkingWplist({}).then((res) => {
         this.ChangZhan = res.data;
       });

src/views/Decision/Decision2.vue

@@ -807,7 +807,7 @@ export default {
     },
     XiangMuVal(val) {
 
- api.benchmarkingProjectList2({
+ api.benchmarkingProjectList({
         wpids: val,
       }).then((res) => {
        this.XiangMu = res.data;

src/views/Decision/Decision2Xldb.vue

@@ -758,6 +758,7 @@ export default {
     api.benchmarkingWplist1({}).then((res) => {
       this.value1.push(res.data[0].id);
       this.AjaxCommon();
+      this.ChangZhanChange(this.value1)
     });
 
     // that.API.requestData({
@@ -799,7 +800,7 @@ export default {
     },
     XiangMuVal(val) {
       api
-        .benchmarkingProjectList1({
+        .benchmarkingProjectList({
           wpids: val,
         })
         .then((res) => {

src/views/Decision/Decision2Xmdb.vue

@@ -749,7 +749,7 @@ export default {
     },
     XiangMuVal(val) {
       api
-        .benchmarkingProjectList2({
+        .benchmarkingProjectList({
           wpids: val,
         })
         .then((res) => {

src/views/Decision/Decision3.vue

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

src/views/Decision/Decision3Db.vue

@@ -125,7 +125,11 @@
         <toolbar-panel :title="'日功率曲线'">
           <template v-slot:tools>
             <div class="tools">
-              <div class="tool-block" v-for="(item, index) in listName">
+              <div
+                class="tool-block"
+                v-for="(item, index) in listName"
+                :key="index"
+              >
                 <div class="legend" :class="'bg-' + (index + 1)"></div>
                 <div class="legend-text">{{ item }}</div>
               </div>
@@ -218,12 +222,13 @@ export default {
   created() {
     this.ChangZhanVal();
     this.value4 = this.getTime(1);
-    this.AjaxCommon();
   },
   methods: {
     ChangZhanVal() {
       api.benchmarkingWplist1({}).then((res) => {
         this.ChangZhan = res.data;
+        this.value1 = res.data[0].code
+        this.XiangMuVal(res.data[0].code)
       });
 
       // var that = this;
@@ -245,10 +250,12 @@ export default {
     XiangMuVal(val) {
       api
         .benchmarkingWtList({
-          wpid: val,
+          wpid: val?val:'',
         })
         .then((res) => {
           this.XiangMu = res.data;
+          this.value2.push(res.data[0].id)
+          this.AjaxCommon();
         });
 
       // var that = this;
@@ -286,9 +293,10 @@ export default {
       }
     },
     AjaxCommon() {
+      console.log(11111111111);
       api
         .ajaxName({
-          ajaxName: that.ajaxName,
+          ajaxName: this.ajaxName,
           wpid: this.value1,
           wtids: this.value2,
           date: this.value4,
@@ -296,7 +304,7 @@ export default {
           sort: "",
         })
         .then((res) => {
-             var data = res.data,
+          var data = res.data,
             data2 = [],
             chart = [],
             fzy = [],
@@ -385,15 +393,13 @@ export default {
           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,
@@ -627,10 +633,10 @@ export default {
     },
   },
   watch: {
-      value4(){
-          this.AjaxCommon();
-      }
-  }
+    value4() {
+      this.AjaxCommon();
+    },
+  },
 };
 </script>
 

src/views/Decision/slgl/fwjsl.vue

@@ -52,6 +52,7 @@
 </template>
 <script>
 import ComTable from "@/components/coms/table/table.vue";
+import api from "@api/economic/index.js";
 export default {
   name: "fwjsl",
   components: { ComTable },