|
@@ -94,7 +94,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="query-actions" style="margin-left:0px">
|
|
|
+ <div class="query-actions" style="margin-left: 0px">
|
|
|
<button class="btn green">搜索</button>
|
|
|
<button class="btn" @click="mxClick()">明细信息</button>
|
|
|
<button class="btn" @click="exportExcel()">导出</button>
|
|
@@ -193,6 +193,7 @@ import SvgIcon from "../../components/coms/icon/svg-icon.vue";
|
|
|
import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
|
|
|
import Table from "./table.vue";
|
|
|
import partten from "@/helper/partten.js";
|
|
|
+import api from "@api/economic/index.js";
|
|
|
export default {
|
|
|
components: {
|
|
|
ToolbarPanel,
|
|
@@ -320,8 +321,8 @@ export default {
|
|
|
var that = this;
|
|
|
that.API.requestData({
|
|
|
method: "GET",
|
|
|
- baseURL: "http://10.155.32.4:9001/",
|
|
|
- subUrl: "benchmarking/wplist",
|
|
|
+ baseURL: "http://10.83.66.220:8020/",
|
|
|
+ subUrl: "/consumer/benchmarking/wplist",
|
|
|
success(res) {
|
|
|
that.ChangZhan = res.data;
|
|
|
},
|
|
@@ -339,8 +340,8 @@ export default {
|
|
|
var that = this;
|
|
|
that.API.requestData({
|
|
|
method: "GET",
|
|
|
- baseURL: "http://10.155.32.4:9001/",
|
|
|
- subUrl: "benchmarking/projectList",
|
|
|
+ baseURL: "http://10.83.66.220:8020/",
|
|
|
+ subUrl: "/consumer/benchmarking/projectList",
|
|
|
data: {
|
|
|
wpids: val,
|
|
|
},
|
|
@@ -360,8 +361,8 @@ export default {
|
|
|
var that = this;
|
|
|
that.API.requestData({
|
|
|
method: "GET",
|
|
|
- baseURL: "http://10.155.32.4:9001/",
|
|
|
- subUrl: "benchmarking/lineList",
|
|
|
+ baseURL: "http://10.83.66.220:8020/",
|
|
|
+ subUrl: "/consumer/benchmarking/lineList",
|
|
|
data: {
|
|
|
projects: val,
|
|
|
},
|
|
@@ -411,85 +412,160 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
AjaxCommon() {
|
|
|
- var that = this;
|
|
|
- that.API.requestData({
|
|
|
- method: "GET",
|
|
|
- baseURL: "http://10.155.32.4:9001/",
|
|
|
- subUrl: "benchmarking/fjjxb",
|
|
|
- data: {
|
|
|
- wpids: that.value1,
|
|
|
- projectids: that.value2,
|
|
|
- lineids: that.value3,
|
|
|
- beginDate: that.value4,
|
|
|
- endDate: that.value5,
|
|
|
- type: that.TypeClass,
|
|
|
+ api.benchmarking({
|
|
|
+ wpids: this.value1,
|
|
|
+ projectids: this.value2,
|
|
|
+ lineids: this.value3,
|
|
|
+ beginDate: this.value4,
|
|
|
+ endDate: this.value5,
|
|
|
+ type: this.TypeClass,
|
|
|
target: "",
|
|
|
sort: "",
|
|
|
- },
|
|
|
- success(res) {
|
|
|
- var name = [],
|
|
|
- data = [],
|
|
|
- llfdl = [],
|
|
|
- legend = [
|
|
|
- "实际电量",
|
|
|
- "计划检修损失",
|
|
|
- "非计划检修损失",
|
|
|
- "限电损失",
|
|
|
- "受累损失",
|
|
|
- "性能损失",
|
|
|
- ],
|
|
|
- data2 = []; //项目列表
|
|
|
- res.data.forEach((item, index) => {
|
|
|
- name.push(item.name);
|
|
|
- data.push([
|
|
|
- item.sjfdl,
|
|
|
- item.jhjx,
|
|
|
- item.fjhjx,
|
|
|
- item.xd,
|
|
|
- item.sl,
|
|
|
- item.xn,
|
|
|
- ]);
|
|
|
- llfdl.push(item.llfdl);
|
|
|
- data2.push({
|
|
|
- index: index + 1,
|
|
|
- name: item.name,
|
|
|
- llfdl: item.llfdl,
|
|
|
- sjfdl: item.sjfdl,
|
|
|
- speed: item.speed,
|
|
|
- fjhjx: item.fjhjx,
|
|
|
- jhjx: item.jhjx,
|
|
|
- sl: item.sl,
|
|
|
- xd: item.xd,
|
|
|
- xn: item.xn,
|
|
|
- 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]);
|
|
|
+ }).then((res) => {
|
|
|
+ if (res) {
|
|
|
+ var name = [],
|
|
|
+ data = [],
|
|
|
+ llfdl = [],
|
|
|
+ legend = [
|
|
|
+ "实际电量",
|
|
|
+ "计划检修损失",
|
|
|
+ "非计划检修损失",
|
|
|
+ "限电损失",
|
|
|
+ "受累损失",
|
|
|
+ "性能损失",
|
|
|
+ ],
|
|
|
+ data2 = []; //项目列表
|
|
|
+ res.data.forEach((item, index) => {
|
|
|
+ name.push(item.name);
|
|
|
+ data.push([
|
|
|
+ item.sjfdl,
|
|
|
+ item.jhjx,
|
|
|
+ item.fjhjx,
|
|
|
+ item.xd,
|
|
|
+ item.sl,
|
|
|
+ item.xn,
|
|
|
+ ]);
|
|
|
+ llfdl.push(item.llfdl);
|
|
|
+ data2.push({
|
|
|
+ index: index + 1,
|
|
|
+ name: item.name,
|
|
|
+ llfdl: item.llfdl,
|
|
|
+ sjfdl: item.sjfdl,
|
|
|
+ speed: item.speed,
|
|
|
+ fjhjx: item.fjhjx,
|
|
|
+ jhjx: item.jhjx,
|
|
|
+ sl: item.sl,
|
|
|
+ xd: item.xd,
|
|
|
+ xn: item.xn,
|
|
|
+ fnlly: item.fnlly,
|
|
|
+ is_light: false,
|
|
|
});
|
|
|
- arr1.push(arr2);
|
|
|
+ });
|
|
|
+ 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);
|
|
|
+ }
|
|
|
+ this.lineData = llfdl;
|
|
|
+ this.bardata = {
|
|
|
+ area: name,
|
|
|
+ legend: legend,
|
|
|
+ data: arr1,
|
|
|
+ };
|
|
|
}
|
|
|
- that.lineData = llfdl;
|
|
|
- that.bardata = {
|
|
|
- area: name,
|
|
|
- legend: legend,
|
|
|
- data: arr1,
|
|
|
- };
|
|
|
+ this.tableDataEnd = data2[data2.length - 1];
|
|
|
+ data2.pop();
|
|
|
+ this.tableData.data = data2;
|
|
|
}
|
|
|
- that.tableDataEnd = data2[data2.length - 1];
|
|
|
- data2.pop();
|
|
|
- that.tableData.data = data2;
|
|
|
- },
|
|
|
- });
|
|
|
+ });
|
|
|
+ // var that = this;
|
|
|
+ // that.API.requestData({
|
|
|
+ // method: "GET",
|
|
|
+ // baseURL: process.env.VUE_APP_API,
|
|
|
+ // subUrl: "consumer/benchmarking/fjjxb",
|
|
|
+ // data: {
|
|
|
+ // wpids: that.value1,
|
|
|
+ // projectids: that.value2,
|
|
|
+ // lineids: that.value3,
|
|
|
+ // beginDate: that.value4,
|
|
|
+ // endDate: that.value5,
|
|
|
+ // type: that.TypeClass,
|
|
|
+ // target: "",
|
|
|
+ // sort: "",
|
|
|
+ // },
|
|
|
+ // success(res) {
|
|
|
+
|
|
|
+ // var name = [],
|
|
|
+ // data = [],
|
|
|
+ // llfdl = [],
|
|
|
+ // legend = [
|
|
|
+ // "实际电量",
|
|
|
+ // "计划检修损失",
|
|
|
+ // "非计划检修损失",
|
|
|
+ // "限电损失",
|
|
|
+ // "受累损失",
|
|
|
+ // "性能损失",
|
|
|
+ // ],
|
|
|
+ // data2 = []; //项目列表
|
|
|
+ // res.data.forEach((item, index) => {
|
|
|
+ // name.push(item.name);
|
|
|
+ // data.push([
|
|
|
+ // item.sjfdl,
|
|
|
+ // item.jhjx,
|
|
|
+ // item.fjhjx,
|
|
|
+ // item.xd,
|
|
|
+ // item.sl,
|
|
|
+ // item.xn,
|
|
|
+ // ]);
|
|
|
+ // llfdl.push(item.llfdl);
|
|
|
+ // data2.push({
|
|
|
+ // index: index + 1,
|
|
|
+ // name: item.name,
|
|
|
+ // llfdl: item.llfdl,
|
|
|
+ // sjfdl: item.sjfdl,
|
|
|
+ // speed: item.speed,
|
|
|
+ // fjhjx: item.fjhjx,
|
|
|
+ // jhjx: item.jhjx,
|
|
|
+ // sl: item.sl,
|
|
|
+ // xd: item.xd,
|
|
|
+ // xn: item.xn,
|
|
|
+ // 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/decision1Mx");
|