From 6404fd33f1c8b86eedc55781c93a79dc91efa64b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 27 Dec 2024 20:15:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_coal/report.vue    | 27 ++++++++++++++++++++++-----
 src/views/enm_rm/report.vue      | 19 +++++++++++--------
 src/views/enm_rm_copy/report.vue | 13 ++++++++-----
 src/views/enm_rmbase/report.vue  |  2 +-
 4 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue
index 93e8a3ab..02e9ac2c 100644
--- a/src/views/enm_coal/report.vue
+++ b/src/views/enm_coal/report.vue
@@ -170,7 +170,7 @@
 	</div>
 </template>
 <script>
-const colors = ["#647bfe", "#8698fe", "#a9b6fe", "#91CC75", "#EE6666"];
+const colors = ["#5b9bd5", "#ed7d31", "#70ad47", "#ffc000", "#4472c4"];
 let tooltip = {
 	show: true,
 	trigger: "axis",
@@ -182,8 +182,8 @@ let tooltip = {
 	triggerOn: "mousemove",
 };
 let grid = {
-	right: "10%",
-	left: "4%",
+	right: "11%",
+	left: "11%",
 	top: "20%",
 };
 let toolbox = {
@@ -242,7 +242,24 @@ let yAxis = [
 		axisLine: {
 			show: true,
 			lineStyle: {
-				color: colors[3],
+				color: colors[2],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
+	{
+		type: "value",
+		name: "台时(t/h)",
+		position: "left",
+		alignTicks: true,
+		nameRotate: 30,
+		offset: 60,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[1],
 			},
 		},
 		axisLabel: {
@@ -375,7 +392,7 @@ export default {
 					{
 						name: "台时产量",
 						type: "bar",
-						yAxisIndex: 0,
+						yAxisIndex: 3,
 						data: [],
 					},
 					{
diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue
index 94fc1092..e1a194ee 100644
--- a/src/views/enm_rm/report.vue
+++ b/src/views/enm_rm/report.vue
@@ -25,7 +25,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="10">生料工序生产报告</th>
+								<th colspan="10">生料辅料工序生产报告</th>
 							</tr>
 							<tr>
 								<th colspan="2">参数</th>
@@ -295,8 +295,8 @@ let tooltip = {
 	// alwaysShowContent:true,
 };
 let grid = {
-	right: "10%",
-	left: "10%",
+	right: "11%",
+	left: "11%",
 	top: "15%",
 };
 let toolbox = {
@@ -409,7 +409,10 @@ export default {
 				tooltip: tooltip,
 				grid: grid,
 				toolbox: toolbox,
-				legend: legend,
+				legend: {
+					top: "2%",
+					data: ["总产量", "分布电耗"],
+				},
 				xAxis: {
 					axisTick: {
 						show: true,
@@ -996,14 +999,14 @@ export default {
 				data.forEach((item) => {
 					let ind = item.hour;
 					seriesData0[ind] = item.total_production;
-					seriesData1[ind] = Number(item.production_hour).toFixed(2);
-					seriesData2[ind] = item.run_rate;
+					// seriesData1[ind] = Number(item.production_hour).toFixed(2);
+					// seriesData2[ind] = item.run_rate;
 					seriesData3[ind] = item.elec_consume_unit;
 				});
 				let options = { ...that.option1 };
 				options.series[0].data = seriesData0;
-				options.series[1].data = seriesData1;
-				options.series[2].data = seriesData2;
+				// options.series[1].data = seriesData1;
+				// options.series[2].data = seriesData2;
 				options.series[3].data = seriesData3;
 				let hourXAxis = [];
 				for (let i = 0; i < 24; i++) {
diff --git a/src/views/enm_rm_copy/report.vue b/src/views/enm_rm_copy/report.vue
index 04620a6d..ccbbff5a 100644
--- a/src/views/enm_rm_copy/report.vue
+++ b/src/views/enm_rm_copy/report.vue
@@ -425,7 +425,10 @@ export default {
 				tooltip: tooltip,
 				grid: grid,
 				toolbox: toolbox,
-				legend: legend,
+				legend: {
+					top: "2%",
+					data: ["总产量", "分布电耗", "成本"],
+				},
 				xAxis: {
 					axisTick: {
 						show: true,
@@ -1070,15 +1073,15 @@ export default {
 				data.forEach((item) => {
 					let ind = item.hour;
 					seriesData0[ind] = item.total_production;
-					seriesData1[ind] = Number(item.production_hour).toFixed(2);
-					seriesData2[ind] = item.run_rate;
+					// seriesData1[ind] = Number(item.production_hour).toFixed(2);
+					// seriesData2[ind] = item.run_rate;
 					seriesData3[ind] = item.elec_consume_unit;
 					seriesData4[ind] = item.production_cost_unit;
 				});
 				let options = { ...that.option1 };
 				options.series[0].data = seriesData0;
-				options.series[1].data = seriesData1;
-				options.series[2].data = seriesData2;
+				// options.series[1].data = seriesData1;
+				// options.series[2].data = seriesData2;
 				options.series[3].data = seriesData3;
 				options.series[4].data = seriesData4;
 				let hourXAxis = [];
diff --git a/src/views/enm_rmbase/report.vue b/src/views/enm_rmbase/report.vue
index da76b007..16b3eb88 100644
--- a/src/views/enm_rmbase/report.vue
+++ b/src/views/enm_rmbase/report.vue
@@ -24,7 +24,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="10">生料工序生产报告</th>
+								<th colspan="10">生料辅料工序生产报告</th>
 							</tr>
 							<tr>
 								<th colspan="2">参数</th>