diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index b257b26a..ab027ca6 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -214,7 +214,7 @@
水泥综合能耗
- {{ hotData.sn_cen_consume_unit}}
+ {{ (Number(hotData.sn_cen_consume_unit)+Number(dicData.b_sn_enegy)).toFixed(2)}}
kgce/t
@@ -251,7 +250,7 @@
水泥工序电耗
- {{ hotData.sn_elec_consume_unit }}
+ {{ (Number(hotData.sn_elec_consume_unit)+Number(dicData.b_sn_elec)).toFixed(2) }}
kw.h/t
@@ -260,7 +259,7 @@
水泥包装工序电耗
- {{ hotData.bz_elec_consume_unit }}
+ {{(Number(hotData.bz_elec_consume_unit) + Number(dicData.b_snbz_elec)).toFixed(2) }}
kw.h/t
@@ -480,12 +479,20 @@ export default {
{ name: "水泥包装", value: 0 },
],
hotData: {
- celec_consume_unit: "", //综合电耗
- coal_consume_unit: "", //单位煤耗
- cen_consume_unit: "", //综合能耗
- sn_cen_consume_unit: "", //水泥综合能耗
- sn_elec_consume_unit: "",//水泥分布电耗
- bz_elec_consume_unit: "",//水泥包装分布电耗
+ celec_consume_unit: 0, //综合电耗
+ coal_consume_unit: 0, //单位煤耗
+ cen_consume_unit: 0, //综合能耗
+ sn_cen_consume_unit: 0, //水泥综合能耗
+ sn_elec_consume_unit: 0,//水泥分布电耗
+ bz_elec_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,
},
tableData: [],
tezhongData: [],
@@ -707,7 +714,8 @@ export default {
this.waterAirData();
this.getMonthData();
this.eqRate();
- this.generation();
+ this.generation();//本月能源数据
+ this.getDicData();//获取字典数据
this.proceElec();
this.qualAnalys();
this.dataCollect();
@@ -1178,11 +1186,12 @@ export default {
params.type = "month_s";
params.mgroup = that.yurefadianId;
this.$API.enm.enstat.req(params).then((ress) => {
- that.hotData.celec_consume_unit =
- ress[0].celec_consume_unit;
- that.hotData.coal_consume_unit =
- ress[0].coal_consume_unit;
- that.hotData.cen_consume_unit = ress[0].cen_consume_unit;
+ that.hotData.celec_consume_unit =Number(ress[0].celec_consume_unit).toFixed(2);
+ that.hotData.coal_consume_unit =Number(ress[0].coal_consume_unit).toFixed(2);
+ that.hotData.cen_consume_unit = Number(ress[0].cen_consume_unit).toFixed(2);
+ console.log(that.hotData.celec_consume_unit);
+ console.log(that.hotData.coal_consume_unit);
+ console.log(that.hotData.cen_consume_unit);
});
});
this.$API.mtm.mgroup.list
@@ -1196,9 +1205,10 @@ export default {
params.type = "month_s";
params.mgroup = that.yurefadianId;
this.$API.enm.enstat.req(params).then((ress) => {
- that.hotData.sn_elec_consume_unit =
- ress[0].elec_consume_unit;
- that.hotData.sn_cen_consume_unit = ress[0].cen_consume_unit;
+ that.hotData.sn_elec_consume_unit =Number(ress[0].elec_consume_unit).toFixed(2);
+ that.hotData.sn_cen_consume_unit = Number(ress[0].cen_consume_unit).toFixed(2);
+ console.log(that.hotData.sn_elec_consume_unit);
+ console.log(that.hotData.sn_cen_consume_unit);
});
});
this.$API.mtm.mgroup.list
@@ -1212,11 +1222,21 @@ export default {
params.type = "month_s";
params.mgroup = that.yurefadianId;
this.$API.enm.enstat.req(params).then((ress) => {
- that.hotData.bz_elec_consume_unit =
- ress[0].elec_consume_unit;
+ that.hotData.bz_elec_consume_unit =Number(ress[0].elec_consume_unit).toFixed(2);
+ console.log(that.hotData.bz_elec_consume_unit);
});
});
- },
+ },
+ //获取本月能源数据字典数据
+ getDicData(){
+ let that = this;
+ this.$API.system.dict.list.req({ type__code: "big_data",page:0 }).then((res) => {
+ that.dicData = {};
+ res.forEach((item, index) => {
+ that.dicData[item.code] = Number(item.value).toFixed(2);
+ })
+ });
+ },
//工序电耗
proceElec() {
let that = this;
@@ -1307,7 +1327,7 @@ export default {
seriesData1[ind] = item.val || 0;
});
// 更新图表数据
- option5.color = ["#cd1e4b", "#3cee10", "#37A2FF", "#FF0087", "#FFBF00"],
+ option5.color = ['#CC00FF', '#FFBF00']
option5.legend.data = [
{
name: "原煤消耗(t)",
@@ -1316,7 +1336,7 @@ export default {
},
borderRadius: 2,
itemStyle: {
- color: "#c30add ",
+ color: that.linearGradientColors[2],
},
},
{
@@ -1326,7 +1346,7 @@ export default {
},
borderRadius: 2,
itemStyle: {
- color: "#df5413",
+ color:that.linearGradientColors[4],
},
},
];
@@ -1340,7 +1360,10 @@ export default {
showSymbol: false,
areaStyle: {
opacity: 0.8,
- color: that.linearGradientColors[6],
+ color: that.linearGradientColors[2],
+ },
+ lineStyle: {
+ color: that.linearGradientColors[2],
},
emphasis: {
focus: "series",
@@ -1356,8 +1379,11 @@ export default {
showSymbol: false,
areaStyle: {
opacity: 0.8,
- color: that.linearGradientColors[5],
+ color: that.linearGradientColors[4],
},
+ lineStyle: {
+ color: that.linearGradientColors[4],
+ },
emphasis: {
focus: "series",
},