fix:修改提交错误

This commit is contained in:
shijing 2024-12-30 10:12:24 +08:00
parent e4bd3cf044
commit 6ea4eb4149
1 changed files with 77 additions and 76 deletions

View File

@ -49,11 +49,11 @@
<th rowspan="2">得分</th> <th rowspan="2">得分</th>
</tr> </tr>
<tr> <tr>
<th>当期值kkW·h/t</th> <th>当期值kKW·h/t</th>
<th>目标值kkW·h/t</th> <th>目标值kKW·h/t</th>
<th>当期与目标值差值kW·h/t</th> <th>当期与目标值差值KW·h/t</th>
<th>环期值kW·h/t</th> <th>环期值KW·h/t</th>
<th>当期与环期值差值kW·h/t</th> <th>当期与环期值差值KW·h/t</th>
<th>环比增长率%</th> <th>环比增长率%</th>
<th>同比增长率%</th> <th>同比增长率%</th>
</tr> </tr>
@ -95,24 +95,11 @@ export default {
let year = myDate.getFullYear(); let year = myDate.getFullYear();
this.timeStamp = myDate.getTime(); this.timeStamp = myDate.getTime();
that.query.year_s = year; that.query.year_s = year;
this.$API.mtm.mgroup.list this.$API.mtm.mgroup.list.req({ page: 0, search: "电石渣" }).then((res) => {
.req({ page: 0, search: "电石渣" }) console.log("工段数据:", res);
.then((res) => { that.query.mgroup = res[0].id;
that.query.mgroup = res[0].id; that.getGoalData();
let params = {}; });
params.page = 0;
params.year = year;
params.mgroup = that.query.mgroup;
this.$API.mtm.goal.list.req(params).then((res) => {
if (res.length > 0) {
res.forEach((item) => {
if (item.goal_cate_name == "单位产品分布电耗kW·h/t") {
that.getData(item);
}
})
}
});
});
}, },
methods: { methods: {
getGoalData() { getGoalData() {
@ -123,16 +110,16 @@ export default {
params.mgroup = self.query.mgroup; params.mgroup = self.query.mgroup;
self.$API.mtm.goal.list.req(params).then((res) => { self.$API.mtm.goal.list.req(params).then((res) => {
if (res.length > 0) { if (res.length > 0) {
res.forEach((item) => { res.forEach((item) => {
if (item.goal_cate_name == "单位产品分布电耗kW·h/t") { if (item.goal_cate_name == "单位产品分布电耗kW·h/t") {
this.getData(item); console.log("目标数据:", item);
} self.getData(item);
}) }
} })
}) }
.catch((error) => { }).catch((error) => {
console.error('获取目标数据失败:', error); console.error('获取目标数据失败:', error);
}); });
}, },
getData(goalData) { getData(goalData) {
let that = this; let that = this;
@ -187,50 +174,64 @@ export default {
arr.push(item.total_production); arr.push(item.total_production);
arr.push(item.production_hour); arr.push(item.production_hour);
arr[4] = item.elec_consume_unit; //kW·h/t arr[4] = item.elec_consume_unit; //KW·h/t
let keyVale = "goal_val_" + n; let keyVale = "goal_val_" + n;
arr[5] = goalData[keyVale]; //kW·h/t// arr[5] = goalData[keyVale]; //KW·h/t//
arr[6] = (arr[4] - arr[5]).toFixed(2); //kW·h/t arr[6] = (arr[4] - arr[5]).toFixed(2); //KW·h/t
let ind_pre = 0, let ind_pre = 0,
huanqi = 0, huanqi = 0,
huanqicha = 0, tongqi = 0,
tongqi = 0, tongqicha = 0;
tongqicha = 0; if (n == 1) {
if (n == 1) { ind_pre = 12;
ind_pre = 12; huanqi = wrapArr0[ind_pre]
huanqi = wrapArr0[ind_pre] ? wrapArr0[ind_pre].elec_consume_unit
? wrapArr0[ind_pre].elec_consume_unit : "/";
: "/"; } else {
} else { // wrapArr0wrapArritem.month_s1 item.namehuanbi
// wrapArr0wrapArritem.month_s1 item.namehuanbi compareArr0.forEach((item0) => {
compareArr0.forEach((item0) => { if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) {
if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) { huanqi = item0[2];
huanqi = item0[2];
}
})
} }
arr[7] = huanqi; //kW·h/t })
if (arr[6] !== "/"){ }
arr[8] = (arr[4] - arr[7]).toFixed(2); //kW·h/t arr[7] = Number(huanqi); //KW·h/t
}else{ if (arr[6] !== "/"){
arr[8] = "/"; //kW·h/t arr[8] = (Number(arr[4]) - arr[7]).toFixed(2); //KW·h/t
} }else{
// arr[8] = huanqicha; //kW·h/t arr[8] = "/"; //KW·h/t
let growthRate = 0; }
if (arr[8]!== "/" && arr[7]!== 0 && arr[8]!== 0 ) { let growthRate = 0;
growthRate = ((arr[8] / arr[7]) * 100).toFixed(2); if (arr[8]!== "/" && arr[7]!== 0 && arr[8]!== 0 ) {
} else{ growthRate = ((Number(arr[8]) /arr[7]) * 100).toFixed(2);
growthRate = "/"; } else{
} growthRate = "/";
arr[9] = growthRate; //% }
if (wrapArr0[n]) { arr[9] = growthRate; //%
tongqicha = if (wrapArr0[n]) {
item.celec_consume_unit - tongqicha =
wrapArr0[n].celec_consume_unit; item.celec_consume_unit -
tongqi = tongqicha / tongqi; wrapArr0[n].celec_consume_unit;
} else { tongqi = tongqicha / tongqi;
tongqicha = item.celec_consume_unit; } else {
tongqi = 0; tongqicha = item.celec_consume_unit;
tongqi = 0;
}
arr[10] = tongqi; //%
//n = month_listkeyvalue, index==0arr[11] = 100 index==1arr[11] = 80 index==2arr[11] = 70 index==3arr[11] = 0
if (month_obj[n]) {
const monthData = month_obj[n];
const itemValue = item.elec_consume_unit; //
const sortedData = monthData.sort((a, b) => parseFloat(b.value) - parseFloat(a.value));
const index = sortedData.findIndex(obj => parseFloat(obj.value) === parseFloat(itemValue));
if (index === 0){
arr[11] = 50;
} else if (index === 1) {
arr[11] = 40;
} else if (index === 2) {
arr[11] = 30;
} else if (index === 3) {
arr[11] = 20;
} }
const total_elec_consume = item.elec_consume; const total_elec_consume = item.elec_consume;
const sortedTotalData = monthData.sort((a, b) => parseFloat(b.elec_consume) - parseFloat(a.elec_consume)); const sortedTotalData = monthData.sort((a, b) => parseFloat(b.elec_consume) - parseFloat(a.elec_consume));