From b53f21be248d8ea49717ecd09a1e3ae816a9848e Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Wed, 9 Jul 2025 11:17:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E7=99=BD=E7=81=B0?=
 =?UTF-8?q?=E7=BA=BF=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_enm_bh.vue | 35 ++++++++++++++++++----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/views/bigScreen/index_enm_bh.vue b/src/views/bigScreen/index_enm_bh.vue
index b08a5354..61536270 100644
--- a/src/views/bigScreen/index_enm_bh.vue
+++ b/src/views/bigScreen/index_enm_bh.vue
@@ -221,10 +221,10 @@
 					</div>
 					<div class="elecItem">
 						<div class="elecItem_wrap">
-							<span>本年单位电耗</span>
+							<span>本月单位煤耗</span>
 							<p class="elec_number">
 								{{ (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>
 						</div>
 					</div>
@@ -297,8 +297,8 @@ export default {
 			// initialAlpha: 2.73,
 			// initialBeta: 1.24,
 			// initialRadius: 8,
-			initialAlpha: 4.03,
-			initialBeta: 1,
+			initialAlpha: 4.6,
+			initialBeta: 0.8,
 			initialRadius: 9.5,
 			initialTarget: null,
 			resizeTimeout: null,
@@ -432,7 +432,7 @@ export default {
 			],
 			hotData: {
 				elec_consume_unit: 0, //本月单位电耗
-				coal_consume_unit: 0, //本年单位电耗
+				coal_consume_unit: 0, //本月单位煤耗
 			},
 			dicData:{
 				elec_month:0,
@@ -1109,6 +1109,8 @@ export default {
 				.then((res) => {
 					that.yurefadianId = res[0].id;
 					let params = {};
+					let mpoint = "3853763497771151360";
+					let total_production = 0;
 					params.page = 0;
 					params.year_s = that.currentYear;
 					params.month_s = that.currentMonth;
@@ -1116,13 +1118,22 @@ export default {
 					params.mgroup = that.yurefadianId;
 					this.$API.enm.enstat.req(params).then((ress) => {
 						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);
-					});
-					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);
-					});
+					}).then((res) => {
+					    if( res.length>0 ){
+							console.log('-----------',res[0].val, total_production)
+							that.hotData.coal_consume_unit = Number(res[0].val)/Number(total_production).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
 			// .req({ page: 0, search: "煤磨" })
@@ -1506,7 +1517,7 @@ export default {
 					that.initialBeta,
 					that.initialRadius,
 					// 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.initialTarget = camera.getTarget();