feat:修改白灰线前端代码
This commit is contained in:
parent
4894b637d1
commit
b53f21be24
|
@ -221,10 +221,10 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="elecItem">
|
<div class="elecItem">
|
||||||
<div class="elecItem_wrap">
|
<div class="elecItem_wrap">
|
||||||
<span>本年单位电耗</span>
|
<span>本月单位煤耗</span>
|
||||||
<p class="elec_number">
|
<p class="elec_number">
|
||||||
{{ (Number(hotData.coal_consume_unit)+Number(dicData.elec_year)).toFixed(2) }}
|
{{ (Number(hotData.coal_consume_unit)+Number(dicData.elec_year)).toFixed(2) }}
|
||||||
<span class="elec_unit">kW·h</span>
|
<span class="elec_unit">t/t</span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -297,8 +297,8 @@ export default {
|
||||||
// initialAlpha: 2.73,
|
// initialAlpha: 2.73,
|
||||||
// initialBeta: 1.24,
|
// initialBeta: 1.24,
|
||||||
// initialRadius: 8,
|
// initialRadius: 8,
|
||||||
initialAlpha: 4.03,
|
initialAlpha: 4.6,
|
||||||
initialBeta: 1,
|
initialBeta: 0.8,
|
||||||
initialRadius: 9.5,
|
initialRadius: 9.5,
|
||||||
initialTarget: null,
|
initialTarget: null,
|
||||||
resizeTimeout: null,
|
resizeTimeout: null,
|
||||||
|
@ -432,7 +432,7 @@ export default {
|
||||||
],
|
],
|
||||||
hotData: {
|
hotData: {
|
||||||
elec_consume_unit: 0, //本月单位电耗
|
elec_consume_unit: 0, //本月单位电耗
|
||||||
coal_consume_unit: 0, //本年单位电耗
|
coal_consume_unit: 0, //本月单位煤耗
|
||||||
},
|
},
|
||||||
dicData:{
|
dicData:{
|
||||||
elec_month:0,
|
elec_month:0,
|
||||||
|
@ -1109,6 +1109,8 @@ export default {
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
that.yurefadianId = res[0].id;
|
that.yurefadianId = res[0].id;
|
||||||
let params = {};
|
let params = {};
|
||||||
|
let mpoint = "3853763497771151360";
|
||||||
|
let total_production = 0;
|
||||||
params.page = 0;
|
params.page = 0;
|
||||||
params.year_s = that.currentYear;
|
params.year_s = that.currentYear;
|
||||||
params.month_s = that.currentMonth;
|
params.month_s = that.currentMonth;
|
||||||
|
@ -1116,13 +1118,22 @@ export default {
|
||||||
params.mgroup = that.yurefadianId;
|
params.mgroup = that.yurefadianId;
|
||||||
this.$API.enm.enstat.req(params).then((ress) => {
|
this.$API.enm.enstat.req(params).then((ress) => {
|
||||||
that.hotData.elec_consume_unit =Number(ress[0].elec_consume_unit).toFixed(2);
|
that.hotData.elec_consume_unit =Number(ress[0].elec_consume_unit).toFixed(2);
|
||||||
|
params.mpoint = mpoint
|
||||||
|
total_production = ress[0].total_production;
|
||||||
|
return that.$API.enm.mpointstat.list.req(params);
|
||||||
// that.hotData.coal_consume_unit =Number(ress[0].coal_consume_unit).toFixed(2);
|
// that.hotData.coal_consume_unit =Number(ress[0].coal_consume_unit).toFixed(2);
|
||||||
});
|
}).then((res) => {
|
||||||
params.type = "year_s";
|
if( res.length>0 ){
|
||||||
params.month_s = null;
|
console.log('-----------',res[0].val, total_production)
|
||||||
this.$API.enm.enstat.req(params).then((ress) => {
|
that.hotData.coal_consume_unit = Number(res[0].val)/Number(total_production).toFixed(2);
|
||||||
that.hotData.coal_consume_unit =Number(ress[0].elec_consume_unit).toFixed(2);
|
}
|
||||||
});
|
}
|
||||||
|
);
|
||||||
|
// params.type = "year_s";
|
||||||
|
// params.month_s = null;
|
||||||
|
// this.$API.enm.enstat.req(params).then((ress) => {
|
||||||
|
// that.hotData.coal_consume_unit =Number(ress[0].elec_consume_unit).toFixed(2);
|
||||||
|
// });
|
||||||
});
|
});
|
||||||
// this.$API.mtm.mgroup.list
|
// this.$API.mtm.mgroup.list
|
||||||
// .req({ page: 0, search: "煤磨" })
|
// .req({ page: 0, search: "煤磨" })
|
||||||
|
@ -1506,7 +1517,7 @@ export default {
|
||||||
that.initialBeta,
|
that.initialBeta,
|
||||||
that.initialRadius,
|
that.initialRadius,
|
||||||
// new BABYLON.Vector3(-0.45, 1.588, 1.93)
|
// new BABYLON.Vector3(-0.45, 1.588, 1.93)
|
||||||
new BABYLON.Vector3(-0.588, -0.3, 0.5)
|
new BABYLON.Vector3(-0.588, -0.5, 0.5)
|
||||||
);
|
);
|
||||||
that.camera = camera;
|
that.camera = camera;
|
||||||
that.initialTarget = camera.getTarget();
|
that.initialTarget = camera.getTarget();
|
||||||
|
|
Loading…
Reference in New Issue