diff --git a/src/views/bigScreen/index_enm_bh.vue b/src/views/bigScreen/index_enm_bh.vue
index 77ad72d3..b08a5354 100644
--- a/src/views/bigScreen/index_enm_bh.vue
+++ b/src/views/bigScreen/index_enm_bh.vue
@@ -214,7 +214,7 @@
本月单位电耗
- {{ (Number(hotData.elec_consume_unit)).toFixed(2) }}
+ {{ (Number(hotData.elec_consume_unit)+Number(dicData.elec_month)).toFixed(2) }}
kW·h
@@ -223,7 +223,7 @@
本年单位电耗
- {{ (Number(hotData.coal_consume_unit)).toFixed(2) }}
+ {{ (Number(hotData.coal_consume_unit)+Number(dicData.elec_year)).toFixed(2) }}
kW·h
@@ -435,12 +435,8 @@ export default {
coal_consume_unit: 0, //本年单位电耗
},
dicData:{
- b_sl_elec:0,
- b_sl_coal:0,
- b_sl_enegy:0,
- b_sn_enegy:0,
- b_sn_elec:0,
- b_snbz_elec:0,
+ elec_month:0,
+ elec_year:0,
},
tableData: [],
tezhongData: [],
diff --git a/src/views/enm_kilnbase/report_lybh.vue b/src/views/enm_kilnbase/report_lybh.vue
index 1829511d..e03c80ab 100644
--- a/src/views/enm_kilnbase/report_lybh.vue
+++ b/src/views/enm_kilnbase/report_lybh.vue
@@ -352,7 +352,7 @@ let toolbox = {
};
let legend = {
top: "2%",
- data: ["总产量", "台时产量", "运转率", "分布电耗", "单位产品煤耗"],
+ data: ["总产量", "台时产量", "运转率", "分布电耗"],
};
let yAxis = [
{
@@ -474,7 +474,7 @@ export default {
toolbox: toolbox,
legend: {
top: "2%",
- data: ["总产量", "分布电耗", "单位产品煤耗"],
+ data: ["总产量", "分布电耗"],
},
xAxis: {
axisTick: {
@@ -517,21 +517,21 @@ export default {
formatter: "{value}",
},
},
- {
- type: "value",
- name: "标煤耗",
- position: "right",
- alignTicks: true,
- axisLine: {
- show: true,
- lineStyle: {
- color: colors[4],
- },
- },
- axisLabel: {
- formatter: "{value}",
- },
- },
+ // {
+ // type: "value",
+ // name: "标煤耗",
+ // position: "right",
+ // alignTicks: true,
+ // axisLine: {
+ // show: true,
+ // lineStyle: {
+ // color: colors[4],
+ // },
+ // },
+ // axisLabel: {
+ // formatter: "{value}",
+ // },
+ // },
],
series: [
{
@@ -546,12 +546,12 @@ export default {
yAxisIndex: 1,
data: [],
},
- {
- name: "单位产品煤耗",
- type: "bar",
- yAxisIndex: 2,
- data: [],
- },
+ // {
+ // name: "单位产品煤耗",
+ // type: "bar",
+ // yAxisIndex: 2,
+ // data: [],
+ // },
],
},
option2: {
@@ -608,12 +608,12 @@ export default {
yAxisIndex: 2,
data: [],
},
- {
- name: "单位产品煤耗",
- type: "bar",
- yAxisIndex: 3,
- data: [],
- },
+ // {
+ // name: "单位产品煤耗",
+ // type: "bar",
+ // yAxisIndex: 3,
+ // data: [],
+ // },
],
},
option3: {
@@ -656,12 +656,12 @@ export default {
yAxisIndex: 2,
data: [],
},
- {
- name: "单位产品煤耗",
- type: "bar",
- yAxisIndex: 3,
- data: [],
- },
+ // {
+ // name: "单位产品煤耗",
+ // type: "bar",
+ // yAxisIndex: 3,
+ // data: [],
+ // },
],
},
};
@@ -840,7 +840,6 @@ export default {
}).then((res6) => {
if (res6.length > 0) {
let data6 = res6[0];
- console.log(res6[0], that.tableDatas[0][5], '-----------------')
that.tableDatas[4][5] = (data6.val/that.tableDatas[0][5]).toFixed(2);
}
});
@@ -1135,7 +1134,7 @@ export default {
}).then((res)=>{
if (res.length > 0) {
let data = res[0];
- that.tableDatas[4][5] = (data.val/that.tableDatas[0][5]).toFixed(2);
+ that.tableDatas[4][5] = (data.val/that.tableDatas[0][4]).toFixed(2);
}
})
},
@@ -1158,12 +1157,12 @@ export default {
let ind = item.hour;
seriesData0[ind] = item.total_production;
seriesData1[ind] = item.elec_consume_unit;
- seriesData2[ind] = item.coal_consume_unit;
+ // seriesData2[ind] = item.coal_consume_unit;
});
let options = { ...that.option1 };
options.series[0].data = seriesData0;
options.series[1].data = seriesData1;
- options.series[2].data = seriesData2;
+ // options.series[2].data = seriesData2;
let hourXAxis = [];
for (let i = 0; i < 24; i++) {
let item = i + "时";
@@ -1195,14 +1194,14 @@ export default {
seriesData1[ind] = item.production_hour;
seriesData2[ind] = item.run_rate;
seriesData3[ind] = item.elec_consume_unit;
- seriesData4[ind] = item.coal_consume_unit;
+ // seriesData4[ind] = item.coal_consume_unit;
});
let options = { ...that.option2 };
options.series[0].data = seriesData0;
options.series[1].data = seriesData1;
options.series[2].data = seriesData2;
options.series[3].data = seriesData3;
- options.series[4].data = seriesData4;
+ // options.series[4].data = seriesData4;
let dayXAxis = [];
let dayss = new Date(year, month, 0).getDate();
for (let i = 1; i <= dayss; i++) {
@@ -1234,14 +1233,14 @@ export default {
seriesData1[ind] = item.production_hour;
seriesData2[ind] = item.run_rate;
seriesData3[ind] = item.elec_consume_unit;
- seriesData4[ind] = item.coal_consume_unit;
+ // seriesData4[ind] = item.coal_consume_unit;
});
let options = { ...that.option3 };
options.series[0].data = seriesData0;
options.series[1].data = seriesData1;
options.series[2].data = seriesData2;
options.series[3].data = seriesData3;
- options.series[4].data = seriesData4;
+ // options.series[4].data = seriesData4;
let monthXAxis = [];
for (let i = 1; i < 13; i++) {
let item = i + "月";