From 421ae76ac621a8444ccba61be8c799f714df268f Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Mon, 16 Dec 2024 14:54:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_enm.vue      | 29 +++++++++++++-------------
 src/views/enm_coal/power.vue           |  2 +-
 src/views/enm_energy/electric_peak.vue |  2 +-
 src/views/enm_energy/energyFactory.vue |  4 ++--
 src/views/enm_energy/energyPicture.vue | 19 +++++++++++++++--
 src/views/enm_kiln/power.vue           |  2 +-
 src/views/enm_kiln/report.vue          |  8 +++++++
 src/views/enm_mill/power.vue           |  2 +-
 src/views/enm_rm/power.vue             |  2 +-
 src/views/enm_slag/power.vue           |  2 +-
 10 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 7bb632f8..f4f25a18 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -206,7 +206,7 @@
 			<div class="flexItem">
 				<div class="itemTitle">
 					<div class="itemTitleIcon"></div>
-					<div>本日能源数据</div>
+					<div>本月能源数据</div>
 				</div>
 				<div class="itemBody" style="padding: 5%">
 					<div class="elecItem">
@@ -428,21 +428,21 @@ export default {
 				new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 					{
 						offset: 0,
-						color: "rgb(60, 238, 16)",
+						color: "rgb(243, 84, 9)",
 					},
 					{
 						offset: 1,
-						color: "rgb(89, 206, 59)",
+						color: "rgb(191, 69, 12)",
 					},
 				]),
 				new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 					{
 						offset: 0,
-						color: "rgb(208, 32, 67)",
+						color: "rgb(213, 9, 241)",
 					},
 					{
 						offset: 1,
-						color: "rgb(199, 74, 99)",
+						color: "rgb(138, 34, 153)",
 					},
 				]),
 			],
@@ -641,18 +641,18 @@ export default {
 									[
 										{
 											offset: 0,
-											color: "rgb(128, 255, 165)",
+											color: "rgb(223, 65, 19)",
 										},
 										{
 											offset: 1,
-											color: "rgb(1, 191, 236)",
+											color: "rgb(223, 20, 20)",
 										},
 									]
 								),
 							},
 							label: {
 								show: true,
-								color: "#02f5f2",
+								color: "#df6d14",
 								formatter: function (params) {
 									return params.value;
 								},
@@ -1141,7 +1141,6 @@ export default {
 				});
 			});
 		},
-		//&环保数据
 		generation() {
 			let that = this;
 			this.$API.mtm.mgroup.list
@@ -1295,7 +1294,7 @@ export default {
 						},
 						borderRadius: 2,
 						itemStyle: {
-							color: "#cd1e4b",
+							color: "#c30add ",
 						},
 					},
 					{
@@ -1305,7 +1304,7 @@ export default {
 						},
 						borderRadius: 2,
 						itemStyle: {
-							color: "#3cee10",
+							color: "#df5413",
 						},
 					},
 				];
@@ -1317,10 +1316,10 @@ export default {
 					data: seriesData,
 					smooth: true,
 					showSymbol: false,
-							areaStyle: {
-								opacity: 0.8,
-								color: that.linearGradientColors[6],
-							},
+					areaStyle: {
+						opacity: 0.8,
+						color: that.linearGradientColors[6],
+					},
 					emphasis: {
 						focus: "series",
 					},
diff --git a/src/views/enm_coal/power.vue b/src/views/enm_coal/power.vue
index 42a95f36..ba7a9974 100644
--- a/src/views/enm_coal/power.vue
+++ b/src/views/enm_coal/power.vue
@@ -31,7 +31,7 @@
 							</tr>
 							<tr>
 								<th>设备名称</th>
-								<th>设备编号</th>
+								<th>设备位号</th>
 								<th>单位</th>
 								<th>上个小时</th>
 								<th>昨日</th>
diff --git a/src/views/enm_energy/electric_peak.vue b/src/views/enm_energy/electric_peak.vue
index bbd715a7..59dbd467 100644
--- a/src/views/enm_energy/electric_peak.vue
+++ b/src/views/enm_energy/electric_peak.vue
@@ -98,7 +98,7 @@
 					end_time:'',
                 },
                 headers: ['生料立磨','循环风机','高温风机','尾排风机','回转窑','水泥磨','水泥循环风机','水泥系统风机','电石渣','原料磨','煤磨','水泥粉磨','水泥包装'],
-                mpoint_name: ['立磨主电机','循环风机-原料磨','高温风机','尾排风机','回转窑合计','水泥高压进线','循环风机-水泥磨','系统风机','电石渣合计','原料磨合计','煤磨合计','水泥磨主电机','包装进线'],
+                mpoint_name: ['原料立磨主电机','循环风机-原料磨','高温风机','尾排风机','回转窑合计','水泥高压进线','循环风机-水泥磨','系统风机','电石渣合计','原料磨合计','煤磨合计','水泥磨主电机','包装进线'],
                 tableData: [
                         ['用电峰','用电尖峰','','','','','','','','','','','','',''],
                         ['用电峰','用电高峰','','','','','','','','','','','','',''],
diff --git a/src/views/enm_energy/energyFactory.vue b/src/views/enm_energy/energyFactory.vue
index 9a9399c2..a46d66ac 100644
--- a/src/views/enm_energy/energyFactory.vue
+++ b/src/views/enm_energy/energyFactory.vue
@@ -108,7 +108,7 @@
                     {index:2,name:'熟料单位产品综合能耗(kgce/t)',value:0,note:''},
                     {index:3,name:'熟料单位产品综合电耗(kw.h/t)',value:0,note:''},
                     {index:4,name:'熟料单位产品综合煤耗(kgce/t)',value:0,note:''},
-                    {index:5,name:'水泥单位产品综合能耗(kgce/t)',value:0,note:''},
+                    {index:5,name:'水泥单位产品分布能耗(kgce/t)',value:0,note:''},
                 ],
 
             };
@@ -157,7 +157,7 @@
                 that.$API.enm.enstat.req(params1).then((res) => {
                     console.log(res[0]);
                     that.tableDatas[0].value = res[0].cen_consume_unit;
-                    that.tableDatas[4].value = res[0].cen_consume_unit;
+                    that.tableDatas[4].value = res[0].elec_consume_unit;
                 });
                 let params2 = {
                     page:0,
diff --git a/src/views/enm_energy/energyPicture.vue b/src/views/enm_energy/energyPicture.vue
index 5c0593f4..94b07a14 100644
--- a/src/views/enm_energy/energyPicture.vue
+++ b/src/views/enm_energy/energyPicture.vue
@@ -4,6 +4,9 @@
             <div class="pictureContainer">
                  <img src="/media/elec_flow.png" class="flowImg" >
                 <!-- <img src="/img/energy.png" class="flowImg" /> -->
+                <div class="pictureHeader" style="top: 35px;">
+                    本日数据  时间段 00:00--24:00
+                </div>
                 <div class="energyNumber energyNumberLeft" style="top: 187px;">
                     <img v-if="dataObj.全厂电量_电" class="iconImg" src="img/elec.png">{{ dataObj.全厂电量_电 }} kWh
                 </div>
@@ -133,7 +136,7 @@
     .energyNumber{
         position: absolute;
         right: 10px;
-        color: rgb(223, 213, 22);
+        color: rgb(20, 244, 23);
         font-size: 15px;
         font-weight: bold;
     }
@@ -153,5 +156,17 @@
     .energyNumberRight{
         right: 328px;
     }
-    
+    .pictureHeader {
+    position: absolute;
+    top: -30px; /* 调整表头距离图片的高度 */
+    left: 50%;
+    transform: translateX(-50%);
+    background-color: #f8f9fa; /* 表头背景颜色 */
+    padding: 5px 10px;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    font-size: 14px;
+    font-weight: bold;
+    color: #333;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/enm_kiln/power.vue b/src/views/enm_kiln/power.vue
index b497f646..de709496 100644
--- a/src/views/enm_kiln/power.vue
+++ b/src/views/enm_kiln/power.vue
@@ -31,7 +31,7 @@
 							</tr>
 							<tr>
 								<th>设备名称</th>
-								<th>设备编号</th>
+								<th>设备位号</th>
 								<th>单位</th>
 								<th>上个小时</th>
 								<th>昨日</th>
diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue
index 0fbcc1c7..1c30dd3d 100644
--- a/src/views/enm_kiln/report.vue
+++ b/src/views/enm_kiln/report.vue
@@ -64,6 +64,9 @@
 								<td class="numCell" v-else-if="index == 10">
 									{{ item[0] }}
 								</td>
+								<td class="numCell" v-else-if="index == 11">
+									{{ item[0] }}
+								</td>
 								<td class="numCell">{{ item[1] }}</td>
 								<td
 									class="numCell hoursItem"
@@ -444,6 +447,7 @@ export default {
 				["能耗", "总电耗（KW·h）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["成本", "单位产品成本（元/吨）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["氨水", "氨水消耗量(t)", 0, 0, 0, 0, 0, 0, 0, 0],
+				["氨水", "单位氨水消耗量(kg/t)", 0, 0, 0, 0, 0, 0, 0, 0],
 			],
 			tableName: "生产报告",
 			modelValue: true,
@@ -696,6 +700,7 @@ export default {
 						that.tableDatas[8][3] = data3.elec_consume;
 						that.tableDatas[9][3] = data3.production_cost_unit;
 						that.tableDatas[10][3] = data3.ammonia_consume;
+						that.tableDatas[11][3] = (data3.ammonia_consume*1000/data3.total_production).toFixed(2);
 					}
 				});
 				//上小时
@@ -718,6 +723,7 @@ export default {
 						that.tableDatas[8][2] = data4.elec_consume;
 						that.tableDatas[9][2] = data4.production_cost_unit;
 						that.tableDatas[10][2] = data4.ammonia_consume;
+						that.tableDatas[11][2] = (data4.ammonia_consume*1000/data4.total_production).toFixed(2);
 					}
 				});
 				let params5 = {};
@@ -841,6 +847,7 @@ export default {
 									that.tableDatas[9][9]
 								);
 								that.tableDatas[10][5] = data1.ammonia_consume;
+								that.tableDatas[11][5] = (data1.ammonia_consume*1000/data1.total_production).toFixed(2);
 							} else {
 							}
 						});
@@ -903,6 +910,7 @@ export default {
 									that.tableDatas[9][6]
 								);
 								that.tableDatas[10][4] = data2.ammonia_consume;
+								that.tableDatas[11][4] = (data2.ammonia_consume*1000/data2.total_production).toFixed(2);
 							}
 						});
 					});
diff --git a/src/views/enm_mill/power.vue b/src/views/enm_mill/power.vue
index ebf0bd6a..122425b8 100644
--- a/src/views/enm_mill/power.vue
+++ b/src/views/enm_mill/power.vue
@@ -31,7 +31,7 @@
 							</tr>
 							<tr>
 								<th>设备名称</th>
-								<th>设备编号</th>
+								<th>设备位号</th>
 								<th>单位</th>
 								<th>上个小时</th>
 								<th>昨日</th>
diff --git a/src/views/enm_rm/power.vue b/src/views/enm_rm/power.vue
index e0894613..c70b6ac1 100644
--- a/src/views/enm_rm/power.vue
+++ b/src/views/enm_rm/power.vue
@@ -31,7 +31,7 @@
 							</tr>
 							<tr>
 								<th>设备名称</th>
-								<th>设备编号</th>
+								<th>设备位号</th>
 								<th>单位</th>
 								<th>上个小时</th>
 								<th>昨日</th>
diff --git a/src/views/enm_slag/power.vue b/src/views/enm_slag/power.vue
index 247e0f01..256342ab 100644
--- a/src/views/enm_slag/power.vue
+++ b/src/views/enm_slag/power.vue
@@ -31,7 +31,7 @@
 							</tr>
 							<tr>
 								<th>设备名称</th>
-								<th>设备编号</th>
+								<th>设备位号</th>
 								<th>单位</th>
 								<th>昨日</th>
 								<th>本月</th>