Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
9bee6af2b1
|
@ -268,8 +268,8 @@ export default {
|
||||||
tableDatas: [
|
tableDatas: [
|
||||||
["产量", "总产量(t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["产量", "总产量(t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["产量", "台时产量(t/h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["产量", "台时产量(t/h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
||||||
["运转时间", "运转时间(h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["运转时间", "运转时间(h)", "/", 0, 0, "/", 0, 0, "/", "/"],
|
||||||
["运转时间", "运转率(%)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["运转时间", "运转率(%)", "/", 0, 0, "/", 0, 0, "/","/"],
|
||||||
["能耗", "煤磨分布电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["能耗", "煤磨分布电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["能耗", "总电耗(KW·h)", 0, 0, 0, 0, "/", "/", "/", "/"]
|
["能耗", "总电耗(KW·h)", 0, 0, 0, 0, "/", "/", "/", "/"]
|
||||||
],
|
],
|
||||||
|
@ -538,12 +538,12 @@ export default {
|
||||||
item5.goal_cate_name == "运转时间(h)"
|
item5.goal_cate_name == "运转时间(h)"
|
||||||
) {
|
) {
|
||||||
that.tableDatas[2][6] = item5[str];
|
that.tableDatas[2][6] = item5[str];
|
||||||
that.tableDatas[2][8] = item5.goal_val;
|
// that.tableDatas[2][8] = item5.goal_val;
|
||||||
} else if (
|
} else if (
|
||||||
item5.goal_cate_name == "运转率(%)"
|
item5.goal_cate_name == "运转率(%)"
|
||||||
) {
|
) {
|
||||||
that.tableDatas[3][6] = item5[str];
|
that.tableDatas[3][6] = item5[str];
|
||||||
that.tableDatas[3][8] = item5.goal_val;
|
// that.tableDatas[3][8] = item5.goal_val;
|
||||||
} else if (
|
} else if (
|
||||||
item5.goal_cate_name ==
|
item5.goal_cate_name ==
|
||||||
"单位产品分布电耗(KW·h/t)"
|
"单位产品分布电耗(KW·h/t)"
|
||||||
|
@ -574,16 +574,16 @@ export default {
|
||||||
that.tableDatas[1][5],
|
that.tableDatas[1][5],
|
||||||
that.tableDatas[1][8]
|
that.tableDatas[1][8]
|
||||||
);
|
);
|
||||||
that.tableDatas[2][5] = data1.run_hour;
|
// that.tableDatas[2][5] = data1.run_hour;
|
||||||
that.tableDatas[2][9] = precen(
|
// that.tableDatas[2][9] = precen(
|
||||||
that.tableDatas[2][5],
|
// that.tableDatas[2][5],
|
||||||
that.tableDatas[2][8]
|
// that.tableDatas[2][8]
|
||||||
);
|
// );
|
||||||
that.tableDatas[3][5] = data1.run_rate;
|
// that.tableDatas[3][5] = data1.run_rate;
|
||||||
that.tableDatas[3][9] = precen(
|
// that.tableDatas[3][9] = precen(
|
||||||
that.tableDatas[3][5],
|
// that.tableDatas[3][5],
|
||||||
that.tableDatas[3][8]
|
// that.tableDatas[3][8]
|
||||||
);
|
// );
|
||||||
that.tableDatas[4][5] = data1.elec_consume_unit;
|
that.tableDatas[4][5] = data1.elec_consume_unit;
|
||||||
that.tableDatas[5][5] = data1.elec_consume;
|
that.tableDatas[5][5] = data1.elec_consume;
|
||||||
that.tableDatas[4][9] = precen(
|
that.tableDatas[4][9] = precen(
|
||||||
|
|
|
@ -438,8 +438,8 @@ export default {
|
||||||
tableDatas: [
|
tableDatas: [
|
||||||
["产量", "总产量(t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["产量", "总产量(t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["产量", "台时产量(t/h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["产量", "台时产量(t/h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
||||||
["运转时间", "运转时间(h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["运转时间", "运转时间(h)", "/", 0, 0, "/", "/", 0, "/", "/"],
|
||||||
["运转时间", "运转率(%)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["运转时间", "运转率(%)", "/", 0, 0, "/", "/", 0, "/", "/"],
|
||||||
["能耗", "单位产品分布电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["能耗", "单位产品分布电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["能耗", "单位产品综合电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["能耗", "单位产品综合电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["能耗", "单位产品标煤耗(kgce/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["能耗", "单位产品标煤耗(kgce/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
@ -748,12 +748,12 @@ export default {
|
||||||
item5.goal_cate_name == "运转时间(h)"
|
item5.goal_cate_name == "运转时间(h)"
|
||||||
) {
|
) {
|
||||||
that.tableDatas[2][6] = item5[str];
|
that.tableDatas[2][6] = item5[str];
|
||||||
that.tableDatas[2][8] = item5.goal_val;
|
// that.tableDatas[2][8] = item5.goal_val;
|
||||||
} else if (
|
} else if (
|
||||||
item5.goal_cate_name == "运转率(%)"
|
item5.goal_cate_name == "运转率(%)"
|
||||||
) {
|
) {
|
||||||
that.tableDatas[3][6] = item5[str];
|
that.tableDatas[3][6] = item5[str];
|
||||||
that.tableDatas[3][8] = item5.goal_val;
|
// that.tableDatas[3][8] = item5.goal_val;
|
||||||
} else if (
|
} else if (
|
||||||
item5.goal_cate_name ==
|
item5.goal_cate_name ==
|
||||||
"单位产品分布电耗(KW·h/t)"
|
"单位产品分布电耗(KW·h/t)"
|
||||||
|
@ -808,16 +808,16 @@ export default {
|
||||||
that.tableDatas[1][5],
|
that.tableDatas[1][5],
|
||||||
that.tableDatas[1][8]
|
that.tableDatas[1][8]
|
||||||
);
|
);
|
||||||
that.tableDatas[2][5] = data1.run_hour;
|
// that.tableDatas[2][5] = data1.run_hour;
|
||||||
that.tableDatas[2][9] = precen(
|
// that.tableDatas[2][9] = precen(
|
||||||
that.tableDatas[2][5],
|
// that.tableDatas[2][5],
|
||||||
that.tableDatas[2][8]
|
// that.tableDatas[2][8]
|
||||||
);
|
// );
|
||||||
that.tableDatas[3][5] = data1.run_rate;
|
// that.tableDatas[3][5] = data1.run_rate;
|
||||||
that.tableDatas[3][9] = precen(
|
// that.tableDatas[3][9] = precen(
|
||||||
that.tableDatas[3][5],
|
// that.tableDatas[3][5],
|
||||||
that.tableDatas[3][8]
|
// that.tableDatas[3][8]
|
||||||
);
|
// );
|
||||||
that.tableDatas[4][5] = data1.elec_consume_unit;
|
that.tableDatas[4][5] = data1.elec_consume_unit;
|
||||||
that.tableDatas[4][9] = precen(
|
that.tableDatas[4][9] = precen(
|
||||||
(that.tableDatas[4][5]-that.tableDatas[4][8]),
|
(that.tableDatas[4][5]-that.tableDatas[4][8]),
|
||||||
|
|
|
@ -404,8 +404,8 @@ export default {
|
||||||
tableDatas: [
|
tableDatas: [
|
||||||
["产量", "总产量(t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["产量", "总产量(t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["产量", "台时产量(t/h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["产量", "台时产量(t/h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
||||||
["运转时间", "运转时间(h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["运转时间", "运转时间(h)", "/", 0, 0, "/", 0, 0, "/", "/"],
|
||||||
["运转时间", "运转率(%)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["运转时间", "运转率(%)", "/", 0, 0, "/", 0, 0, "/", "/"],
|
||||||
["能耗", "单位产品分布电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["能耗", "单位产品分布电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["能耗", "单位产品综合能耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["能耗", "单位产品综合能耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["能耗", "总电耗(KW·h)", 0, 0, 0, 0, "/", "/", "/", "/"],
|
["能耗", "总电耗(KW·h)", 0, 0, 0, 0, "/", "/", "/", "/"],
|
||||||
|
@ -684,12 +684,12 @@ export default {
|
||||||
item5.goal_cate_name == "运转时间(h)"
|
item5.goal_cate_name == "运转时间(h)"
|
||||||
) {
|
) {
|
||||||
that.tableDatas[2][6] = item5[str];
|
that.tableDatas[2][6] = item5[str];
|
||||||
that.tableDatas[2][8] = item5.goal_val;
|
// that.tableDatas[2][8] = item5.goal_val;
|
||||||
} else if (
|
} else if (
|
||||||
item5.goal_cate_name == "运转率(%)"
|
item5.goal_cate_name == "运转率(%)"
|
||||||
) {
|
) {
|
||||||
that.tableDatas[3][6] = item5[str];
|
that.tableDatas[3][6] = item5[str];
|
||||||
that.tableDatas[3][8] = item5.goal_val;
|
// that.tableDatas[3][8] = item5.goal_val;
|
||||||
} else if (
|
} else if (
|
||||||
item5.goal_cate_name ==
|
item5.goal_cate_name ==
|
||||||
"单位产品分布电耗(KW·h/t)"
|
"单位产品分布电耗(KW·h/t)"
|
||||||
|
@ -732,16 +732,16 @@ export default {
|
||||||
that.tableDatas[1][5],
|
that.tableDatas[1][5],
|
||||||
that.tableDatas[1][8]
|
that.tableDatas[1][8]
|
||||||
);
|
);
|
||||||
that.tableDatas[2][5] = data1.run_hour;
|
// that.tableDatas[2][5] = data1.run_hour;
|
||||||
that.tableDatas[2][9] = precen(
|
// that.tableDatas[2][9] = precen(
|
||||||
that.tableDatas[2][5],
|
// that.tableDatas[2][5],
|
||||||
that.tableDatas[2][8]
|
// that.tableDatas[2][8]
|
||||||
);
|
// );
|
||||||
that.tableDatas[3][5] = data1.run_rate;
|
// that.tableDatas[3][5] = data1.run_rate;
|
||||||
that.tableDatas[3][9] = precen(
|
// that.tableDatas[3][9] = precen(
|
||||||
that.tableDatas[3][5],
|
// that.tableDatas[3][5],
|
||||||
that.tableDatas[3][8]
|
// that.tableDatas[3][8]
|
||||||
);
|
// );
|
||||||
that.tableDatas[4][5] = data1.elec_consume_unit;
|
that.tableDatas[4][5] = data1.elec_consume_unit;
|
||||||
that.tableDatas[4][9] = precen(
|
that.tableDatas[4][9] = precen(
|
||||||
that.tableDatas[4][5]-that.tableDatas[4][8],
|
that.tableDatas[4][5]-that.tableDatas[4][8],
|
||||||
|
|
|
@ -264,6 +264,7 @@
|
||||||
wrapArr = wrapArr.filter(item=>{
|
wrapArr = wrapArr.filter(item=>{
|
||||||
return item
|
return item
|
||||||
})
|
})
|
||||||
|
console.log(wrapArr,'warpArr')
|
||||||
wrapArr.forEach((item1,index1)=>{
|
wrapArr.forEach((item1,index1)=>{
|
||||||
if(item1!=undefined){//一天的数据
|
if(item1!=undefined){//一天的数据
|
||||||
let itemArr = [];
|
let itemArr = [];
|
||||||
|
|
|
@ -405,8 +405,8 @@ export default {
|
||||||
tableDatas: [
|
tableDatas: [
|
||||||
["产量", "总产量(t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["产量", "总产量(t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["产量", "台时产量(t/h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["产量", "台时产量(t/h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
||||||
["运转时间", "运转时间(h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["运转时间", "运转时间(h)", "/", 0, 0, "/", 0, 0, "/", "/"],
|
||||||
["运转时间", "运转率(%)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["运转时间", "运转率(%)", "/", 0, 0, "/", 0, 0, "/", "/"],
|
||||||
["能耗", "生料分布电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["能耗", "生料分布电耗(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["能耗", "总电耗(KW·h)", 0, 0, 0, 0, "/", "/", "/","/"],
|
["能耗", "总电耗(KW·h)", 0, 0, 0, 0, "/", "/", "/","/"],
|
||||||
["成本", "生料成本(元/吨)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["成本", "生料成本(元/吨)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
@ -881,12 +881,12 @@ export default {
|
||||||
item5.goal_cate_name == "运转时间(h)"
|
item5.goal_cate_name == "运转时间(h)"
|
||||||
) {
|
) {
|
||||||
that.tableDatas[2][6] = item5[str];
|
that.tableDatas[2][6] = item5[str];
|
||||||
that.tableDatas[2][8] = item5.goal_val;
|
// that.tableDatas[2][8] = item5.goal_val;
|
||||||
} else if (
|
} else if (
|
||||||
item5.goal_cate_name == "运转率(%)"
|
item5.goal_cate_name == "运转率(%)"
|
||||||
) {
|
) {
|
||||||
that.tableDatas[3][6] = item5[str];
|
that.tableDatas[3][6] = item5[str];
|
||||||
that.tableDatas[3][8] = item5.goal_val;
|
// that.tableDatas[3][8] = item5.goal_val;
|
||||||
} else if (
|
} else if (
|
||||||
item5.goal_cate_name ==
|
item5.goal_cate_name ==
|
||||||
"单位产品分布电耗(KW·h/t)"
|
"单位产品分布电耗(KW·h/t)"
|
||||||
|
@ -925,16 +925,16 @@ export default {
|
||||||
that.tableDatas[1][5],
|
that.tableDatas[1][5],
|
||||||
that.tableDatas[1][8]
|
that.tableDatas[1][8]
|
||||||
);
|
);
|
||||||
that.tableDatas[2][5] = data1.run_hour;
|
// that.tableDatas[2][5] = data1.run_hour;
|
||||||
that.tableDatas[2][9] = precen(
|
// that.tableDatas[2][9] = precen(
|
||||||
that.tableDatas[2][5],
|
// that.tableDatas[2][5],
|
||||||
that.tableDatas[2][8]
|
// that.tableDatas[2][8]
|
||||||
);
|
// );
|
||||||
that.tableDatas[3][5] = data1.run_rate;
|
// that.tableDatas[3][5] = data1.run_rate;
|
||||||
that.tableDatas[3][9] = precen(
|
// that.tableDatas[3][9] = precen(
|
||||||
that.tableDatas[3][5],
|
// that.tableDatas[3][5],
|
||||||
that.tableDatas[3][8]
|
// that.tableDatas[3][8]
|
||||||
);
|
// );
|
||||||
that.tableDatas[4][5] =
|
that.tableDatas[4][5] =
|
||||||
data1.elec_consume_unit;
|
data1.elec_consume_unit;
|
||||||
that.tableDatas[4][9] = precen(
|
that.tableDatas[4][9] = precen(
|
||||||
|
|
Loading…
Reference in New Issue