From a8c948775e05a3a56cff03cc39c3a9019378c8d1 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 26 Dec 2024 16:25:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:coding#741&&=E7=94=9F=E4=BA=A7=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=9B=BE=E8=A1=A8=E7=BA=A0=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_enm.vue |  14 +++-
 src/views/enm_mill/report.vue     |  12 +--
 src/views/enm_pack/report.vue     |   4 +-
 src/views/enm_rm/report.vue       |  12 +--
 src/views/enm_slag/report.vue     | 134 ++++++++++++++++--------------
 5 files changed, 99 insertions(+), 77 deletions(-)

diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 7395aa4e..b257b26a 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -4,6 +4,7 @@
 			<span class="top-line top-line-left"></span>
 			{{ bigScreenName }}
 			<span class="top-line top-line-right"></span>
+			<div class="backHomeBtn" style="right: 100px;" @click.prevent="backHome">返回首页</div>
 		</header>
 		<div id="model" class="model">
 			<div class="top_block">
@@ -726,6 +727,10 @@ export default {
 		clearInterval(this.timerOther);}
 	},
 	methods: {
+		backHome(){
+			// this.$router.push({ name: "user" });
+			window.location.href =  "http://tkx.xxhhcty.xyz:8080/#/dashboard_enm";
+		},
 		initializeData() {
 			this.productNum();
 			this.waterAirData();
@@ -2049,7 +2054,14 @@ export default {
 	src: url("../../utils/youShe.ttf");
 	/* 字体文件相对路径 */
 }
-
+.backHomeBtn{
+	position: absolute;
+	top: 10px;
+	right: 10px;
+	cursor: pointer;
+	 font-size: 22px;
+	 border-bottom: 2px solid rgba(54, 217, 187, 1);
+}
 .container {
 	background: url("/public/img/photon_bg.png") no-repeat;
 	background-size: cover;
diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue
index bd2f768b..f7d11606 100644
--- a/src/views/enm_mill/report.vue
+++ b/src/views/enm_mill/report.vue
@@ -883,8 +883,8 @@ export default {
 				options.series[0].data = seriesData0;
 				options.series[1].data = seriesData1;
 				options.series[2].data = seriesData2;
-				options.series[3].data = seriesData3;
-				options.series[4].data = seriesData4;
+				options.series[3].data = seriesData4;
+				options.series[4].data = seriesData3;
 				let hourXAxis = [];
 				for (let i = 0; i < 24; i++) {
 					let item = i + "时";
@@ -922,8 +922,8 @@ export default {
 				options.series[0].data = seriesData0;
 				options.series[1].data = seriesData1;
 				options.series[2].data = seriesData2;
-				options.series[3].data = seriesData3;
-				options.series[4].data = seriesData4;
+				options.series[3].data = seriesData4;
+				options.series[4].data = seriesData3;
 				let dayXAxis = [];
 				for (let i = 1; i <= data.length; i++) {
 					let item = i + "日";
@@ -960,8 +960,8 @@ export default {
 				options.series[0].data = seriesData0;
 				options.series[1].data = seriesData1;
 				options.series[2].data = seriesData2;
-				options.series[3].data = seriesData3;
-				options.series[4].data = seriesData4;
+				options.series[3].data = seriesData4;
+				options.series[4].data = seriesData3;
 				let monthXAxis = [];
 				for (let i = 1; i <= that.month; i++) {
 					let item = i + "月";
diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue
index 57400ff2..bcb4cba5 100644
--- a/src/views/enm_pack/report.vue
+++ b/src/views/enm_pack/report.vue
@@ -237,7 +237,7 @@
 	</div>
 </template>
 <script>
-const colors = ["#647bfe", "#91CC75", "#EE6666"];
+const colors = ["#647bfe", "#cbd3fe", "#91CC75", "#EE6666", "#CC00CC", "#551e13"];
 let tooltip = {
 	show: true,
 	trigger: "axis",
@@ -262,7 +262,7 @@ let toolbox = {
 };
 let legend = {
 	top: "2%",
-	data: ["熟料", "分布电耗"],
+	data: ["总产量","P.O42.5R 散装","P.O42.5R 袋装","P.O42.5 袋装","P.O42.5 散装","P.C42.5 散装","P.C42.5 散装","P.O52.5 散装","熟料","分布电耗"],
 };
 let yAxis = [
 	{
diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue
index d074c704..7330ad2c 100644
--- a/src/views/enm_rm/report.vue
+++ b/src/views/enm_rm/report.vue
@@ -1072,8 +1072,8 @@ export default {
 					seriesData0[ind] = item.total_production;
 					seriesData1[ind] = Number(item.production_hour).toFixed(2);
 					seriesData2[ind] = item.run_rate;
-					seriesData3[ind] = item.production_cost_unit;
-					seriesData4[ind] = item.elec_consume_unit;
+					seriesData3[ind] = item.elec_consume_unit;
+					seriesData4[ind] = item.production_cost_unit;
 				});
 				let options = { ...that.option1 };
 				options.series[0].data = seriesData0;
@@ -1111,8 +1111,8 @@ export default {
 					seriesData0[ind] = item.total_production;
 					seriesData1[ind] = Number(item.production_hour).toFixed(2);
 					seriesData2[ind] = item.run_rate;
-					seriesData3[ind] = item.production_cost_unit;
-					seriesData4[ind] = item.elec_consume_unit;
+					seriesData3[ind] = item.elec_consume_unit;
+					seriesData4[ind] = item.production_cost_unit;
 				});
 				let options = { ...that.option2 };
 				options.series[0].data = seriesData0;
@@ -1149,8 +1149,8 @@ export default {
 					seriesData0[ind] = item.total_production;
 					seriesData1[ind] = Number(item.production_hour).toFixed(2);
 					seriesData2[ind] = item.run_rate;
-					seriesData3[ind] = item.production_cost_unit;
-					seriesData4[ind] = item.elec_consume_unit;
+					seriesData3[ind] = item.elec_consume_unit;
+					seriesData4[ind] = item.production_cost_unit;
 				});
 				let options = { ...that.option3 };
 				options.series[0].data = seriesData0;
diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue
index d37702c6..895b900b 100644
--- a/src/views/enm_slag/report.vue
+++ b/src/views/enm_slag/report.vue
@@ -279,9 +279,10 @@ let legend = {
 let yAxis = [
 	{
 		type: "value",
-		name: "产量 (t)",
+		name: "总产量 (t)",
 		position: "left",
 		alignTicks: true,
+		nameRotate: 45,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -294,26 +295,11 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "总电耗(KW.h)",
+		nameRotate: 45,
+		name: "分布电耗(KW.h)",
 		position: "left",
 		alignTicks: true,
-		offset: 80,
-		axisLine: {
-			show: true,
-			lineStyle: {
-				color: colors[5],
-			},
-		},
-		axisLabel: {
-			formatter: "{value}",
-		},
-	},
-	{
-		type: "value",
-		name: "分布电耗(KW.h)",
-		position: "right",
-		alignTicks: true,
-		offset: 80,
+		offset: 100,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -326,9 +312,11 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "成本(元)",
-		position: "right",
+		nameRotate: 45,
+		name: "总电耗(KW.h)",
+		position: "left",
 		alignTicks: true,
+		offset: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -339,12 +327,13 @@ let yAxis = [
 			formatter: "{value}",
 		},
 	},
+	
 	{
 		type: "value",
-		name: "消耗(t)",
+		nameRotate: 45,
+		name: "成本(元)",
 		position: "right",
 		alignTicks: true,
-		offset: 130,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -357,10 +346,11 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "进厂(t)",
+		name: "消耗(t)",
 		position: "right",
 		alignTicks: true,
-		offset: 180,
+		nameRotate: 45,
+		offset: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -371,6 +361,23 @@ let yAxis = [
 			formatter: "{value}",
 		},
 	},
+	{
+		type: "value",
+		name: "进厂(t)",
+		position: "right",
+		alignTicks: true,
+		nameRotate: 45,
+		offset: 100,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[5],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
 ];
 export default {
 	components: {
@@ -434,18 +441,18 @@ export default {
 						yAxisIndex: 0,
 						data: [],
 					},
-					{
-						name: "总电耗",
-						type: "bar",
-						yAxisIndex: 5,
-						data: [],
-					},
 					{
 						name: "分布电耗",
 						type: "bar",
 						yAxisIndex: 1,
 						data: [],
 					},
+					{
+						name: "总电耗",
+						type: "bar",
+						yAxisIndex: 5,
+						data: [],
+					},
 					{
 						name: "成本",
 						type: "bar",
@@ -488,12 +495,6 @@ export default {
 						yAxisIndex: 0,
 						data: [],
 					},
-					{
-						name: "总电耗",
-						type: "bar",
-						yAxisIndex: 5,
-						data: [],
-					},
 					{
 						name: "分布电耗",
 						type: "bar",
@@ -501,23 +502,29 @@ export default {
 						data: [],
 					},
 					{
-						name: "成本",
+						name: "总电耗",
 						type: "bar",
 						yAxisIndex: 2,
 						data: [],
 					},
 					{
-						name: "消耗",
+						name: "成本",
 						type: "bar",
 						yAxisIndex: 3,
 						data: [],
 					},
 					{
-						name: "进厂",
+						name: "消耗",
 						type: "bar",
 						yAxisIndex: 4,
 						data: [],
 					},
+					{
+						name: "进厂",
+						type: "bar",
+						yAxisIndex: 5,
+						data: [],
+					},
 				],
 			},
 		};
@@ -742,21 +749,21 @@ export default {
 					seriesData5[ind] = item.elec_consume;
 					if (item.imaterial_data.length > 0) {
 						item.imaterial_data.forEach((items_n) => {
-									if (items_n.material_name == "湿电石渣消耗") {
-										seriesData3[ind] = items_n.amount_consume;
-									}else if(items_n.material_name == "湿电石渣进厂"){
-										seriesData4[ind] = items_n.amount_consume;
-									}
+							if (items_n.material_name == "湿电石渣消耗") {
+								seriesData3[ind] = items_n.amount_consume;
+							}else if(items_n.material_name == "湿电石渣进厂"){
+								seriesData4[ind] = items_n.amount_consume;
+							}
 						});	
-								}
+					}
 				});
 				let options = { ...that.option1 };
 				options.series[0].data = seriesData0;
-				options.series[1].data = seriesData1;
-				options.series[2].data = seriesData2;
-				options.series[3].data = seriesData3;
-				options.series[4].data = seriesData4;
-				options.series[5].data = seriesData5;
+				options.series[1].data = seriesData2;
+				options.series[2].data = seriesData5;
+				options.series[3].data = seriesData1;
+				options.series[4].data = seriesData3;
+				options.series[5].data = seriesData4;
 				let dayXAxis = [];
 				for (let i = 1; i <= data.length; i++) {
 					let item = i + "日";
@@ -779,29 +786,32 @@ export default {
 					seriesData1 = [],
 					seriesData2 = [],
 					seriesData3 = [],
-					seriesData4 = [];
+					seriesData4 = [],
+					seriesData5 = [];
 				let data = response;
 				data.forEach((item) => {
 					let ind = item.month_s - 1;
 					seriesData0[ind] = item.total_production;
 					seriesData1[ind] = item.production_cost_unit;
 					seriesData2[ind] = item.elec_consume_unit;
+					seriesData5[ind] = item.elec_consume;
 					if (item.imaterial_data.length > 0) {
 						item.imaterial_data.forEach((items_n) => {
-									if (items_n.material_name == "湿电石渣消耗") {
-										seriesData3[ind] = items_n.amount_consume;
-									}else if(items_n.material_name == "湿电石渣进厂"){
-										seriesData4[ind] = items_n.amount_consume;
-									}
+							if (items_n.material_name == "湿电石渣消耗") {
+								seriesData3[ind] = Math.round(items_n.amount_consume);
+							}else if(items_n.material_name == "湿电石渣进厂"){
+								seriesData4[ind] = items_n.amount_consume;
+							}
 						});	
-								}
+					}
 				});
 				let options = { ...that.option2 };
 				options.series[0].data = seriesData0;
-				options.series[1].data = seriesData1;
-				options.series[2].data = seriesData2;
-				options.series[3].data = seriesData3;
-				options.series[4].data = seriesData4;
+				options.series[1].data = seriesData2;
+				options.series[2].data = seriesData5;
+				options.series[3].data = seriesData1;
+				options.series[4].data = seriesData3;
+				options.series[5].data = seriesData4;
 				let monthXAxis = [];
 				for (let i = 1; i <= that.month; i++) {
 					let item = i + "月";