From 42e1c56be4d37cb86639409ee005a0d5062cddb2 Mon Sep 17 00:00:00 2001
From: TianyangZhang <zty18395607196@163.com>
Date: Thu, 11 Dec 2025 09:43:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9tkx=20=E7=8F=AD?=
 =?UTF-8?q?=E7=BB=84=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_kilnbase/workshopAnalysis.vue | 14 +++---
 src/views/enm_rm/report.vue                 | 56 ++++++++-------------
 2 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/src/views/enm_kilnbase/workshopAnalysis.vue b/src/views/enm_kilnbase/workshopAnalysis.vue
index a4c72f2a..1f834b7c 100644
--- a/src/views/enm_kilnbase/workshopAnalysis.vue
+++ b/src/views/enm_kilnbase/workshopAnalysis.vue
@@ -81,7 +81,7 @@
 										<span v-if="item1 < 0 && ind == 5"
 											>▲</span
 										>
-										<span v-if="item1 < 0 && ind == 5"
+										<span v-if="item1 > 0 && ind == 5"
 											>▼</span
 										>
 										{{ item1 }}
@@ -131,7 +131,7 @@
 										<span v-if="item1 < 0 && ind == 6"
 											>▲</span
 										>
-										<span v-if="item1 < 0 && ind == 6"
+										<span v-if="item1 > 0 && ind == 6"
 											>▼</span
 										>
 										{{ item1 }}
@@ -181,7 +181,7 @@
 										<span v-if="item1 < 0 && ind == 6"
 											>▲</span
 										>
-										<span v-if="item1 < 0 && ind == 6"
+										<span v-if="item1 > 0 && ind == 6"
 											>▼</span
 										>
 										{{ item1 }}
@@ -231,7 +231,7 @@
 										<span v-if="item1 < 0 && ind == 6"
 											>▲</span
 										>
-										<span v-if="item1 < 0 && ind == 6"
+										<span v-if="item1 > 0 && ind == 6"
 											>▼</span
 										>
 										{{ item1 }}
@@ -508,7 +508,7 @@ export default {
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
-								lastDiff = arrs[1] - arrs[4];
+								lastDiff = (arrs[1] - arrs[4]).toFixed(2);
 							} else {
 								lastDiff = "/";
 							}
@@ -532,10 +532,10 @@ export default {
 								wrapArr0[index].elec_consume_unit
 							) {
 								sameRate =
-									((arrs[1] -
+									(((arrs[1] -
 										wrapArr0[index].elec_consume_unit) /
 										wrapArr0[index].elec_consume_unit) *
-									100;
+									100).toFixed(2);
 							} else {
 								sameRate = "/";
 							}
diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue
index f23b9b01..370cfc15 100644
--- a/src/views/enm_rm/report.vue
+++ b/src/views/enm_rm/report.vue
@@ -1231,19 +1231,13 @@ export default {
 						that.tableDatas[3][2] = 0;
 						
 					}else{
-						that.tableDatas[1][2] = data4.elec_consume_unit;
-						that.tableDatas[2][2] = data4.elec_consume;
-						that.tableDatas[3][2] = data4.production_cost_unit;}
-						
-					if (data4.imaterial_data.length > 0) {
-						data4.imaterial_data.forEach((item) => {
-						if (item.material_name == "湿电石渣消耗") {
-							that.tableDatas[4][2] = item.amount_consume;
-						}else if(item.material_name == "湿电石渣进厂"){
-							that.tableDatas[5][2] = item.amount_consume;
-						}
-					});	
+						that.tableDatas[1][2] = data4.production_hour;
+						that.tableDatas[2][2] = data4.run_hour;
+						that.tableDatas[3][2] = data4.run_rate;
+						that.tableDatas[4][2] = data4.elec_consume_unit;
+						that.tableDatas[5][2] = data4.elec_consume;
 					}
+						
 				}
 			});
 		},
@@ -1263,40 +1257,32 @@ export default {
 					that.tableDatas[0][4],
 					that.tableDatas[0][6]
 				);
-				that.tableDatas[1][4] = data2.elec_consume_unit;
+				that.tableDatas[1][4] = data2.production_hour;
 				that.tableDatas[1][7] = this.consume_precen(
 					that.tableDatas[1][4],
 					that.tableDatas[1][6]
 				);
-				that.tableDatas[2][4] = data2.elec_consume;
-				that.tableDatas[3][4] =
-					data2.production_cost_unit;
+				that.tableDatas[2][4] = data2.run_hour;
+				that.tableDatas[3][4] = data2.run_rate;
 				that.tableDatas[3][7] = this.consume_precen(
-					that.tableDatas[3][3],
+					that.tableDatas[3][4],
 					that.tableDatas[3][6]
 				);
 				that.tableDatas[2][7] = this.consume_precen(
 					that.tableDatas[2][4],
 					that.tableDatas[2][6]
 				);
-				if (data2.imaterial_data.length > 0) {
-					data2.imaterial_data.forEach((item) => {
-					if (item.material_name == "湿电石渣消耗") {
-						that.tableDatas[4][4] = (item.amount_consume).toFixed(2);
-						that.tableDatas[4][7] = this.precen(
-							that.tableDatas[4][4],
-							that.tableDatas[4][6]
-						);
-					}else if(item.material_name == "湿电石渣进厂"){
-						that.tableDatas[5][4] = (item.amount_consume).toFixed(2);
-						that.tableDatas[5][7] = this.precen(
-							that.tableDatas[5][4],
-							that.tableDatas[5][6]											
-						);
-					}
-			});	
-					}
-				}
+				that.tableDatas[4][4] = data2.elec_consume_unit;
+				that.tableDatas[4][7] = this.consume_precen(
+					(that.tableDatas[4][4]-that.tableDatas[4][6]),
+					that.tableDatas[4][6]
+				);
+				that.tableDatas[5][4] = data2.elec_consume;
+				that.tableDatas[5][7] = this.consume_precen(
+					(that.tableDatas[5][4] - that.tableDatas[5][6]),
+					that.tableDatas[5][6]
+				);
+			}
 			});
 		},
 		get_month_year_goal(year, month){