From e0e043398f6a39a15e896022106a497796df234a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 30 Dec 2024 13:55:59 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E7=94=9F=E4=BA=A7=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=9B=BE=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_coal/report.vue    | 84 ++++++++++++++-------------
 src/views/enm_kiln/report.vue    | 98 ++++++++++++++++++--------------
 src/views/enm_mill/report.vue    | 30 +++++-----
 src/views/enm_pack/report.vue    | 27 ++++++---
 src/views/enm_rm/report.vue      | 57 +++++++++++++------
 src/views/enm_rm_copy/report.vue | 63 ++++++++++++--------
 src/views/enm_slag/report.vue    | 31 ++++++----
 7 files changed, 236 insertions(+), 154 deletions(-)

diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue
index f44d038b..0ac7b632 100644
--- a/src/views/enm_coal/report.vue
+++ b/src/views/enm_coal/report.vue
@@ -94,9 +94,9 @@
 						>
 							<!-- <el-radio-button label="day">本日</el-radio-button> -->
 							<el-radio-button label="month"
-								>日</el-radio-button
+								>按日</el-radio-button
 							>
-							<el-radio-button label="year">月</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -170,7 +170,7 @@
 	</div>
 </template>
 <script>
-const colors = ["#5b9bd5", "#ed7d31", "#70ad47", "#ffc000", "#4472c4"];
+const colors = ["#5b9bd5", "#ed7d31", "#70ad47", "#ffc000", "#4472c4", "#91d024"];
 let tooltip = {
 	show: true,
 	trigger: "axis",
@@ -187,14 +187,24 @@ let grid = {
 	top: "20%",
 };
 let toolbox = {
-	right: "2%",
+	right: 0,
 	feature: {
 		dataView: { show: true, readOnly: false },
-		// restore: { show: true },
 		saveAsImage: { show: true },
 	},
+	orient: "vertical",
 };
 let legend = {
+	selector: [
+		{
+			type: 'all',
+			title: '全选'
+		},
+		{
+			type: 'inverse',
+			title: '反选'
+		}
+	],
 	top: "2%",
 	data: ["总产量", "台时产量", "运转率", "分布电耗"],
 };
@@ -204,7 +214,7 @@ let yAxis = [
 		name: "产量 (t)",
 		position: "left",
 		alignTicks: true,
-		nameRotate: 30,
+		nameRotate: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -215,14 +225,30 @@ let yAxis = [
 			formatter: "{value}",
 		},
 	},
+	{
+		type: "value",
+		name: "台时(t/h)",
+		position: "left",
+		alignTicks: true,
+		nameRotate: 50,
+		offset: 50,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[1],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
 	{
 		type: "value",
 		name: "运转率 (%)",
 		position: "right",
 		alignTicks: true,
-		offset: 60,
-		max: 100,
-		nameRotate: 30,
+		offset: 50,
+		nameRotate: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -238,28 +264,11 @@ let yAxis = [
 		name: "分布电耗(kW·h/t)",
 		position: "right",
 		alignTicks: true,
-		nameRotate: 30,
+		nameRotate: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
-				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],
+				color: colors[3],
 			},
 		},
 		axisLabel: {
@@ -268,7 +277,6 @@ let yAxis = [
 	},
 ];
 import scEcharts from "@/components/scEcharts";
-import { max } from "d3";
 import { defineAsyncComponent } from "vue";
 export default {
 	components: {
@@ -349,19 +357,19 @@ export default {
 					{
 						name: "台时产量",
 						type: "bar",
-						yAxisIndex: 0,
+						yAxisIndex: 1,
 						data: [],
 					},
 					{
 						name: "运转率",
 						type: "line",
-						yAxisIndex: 1,
+						yAxisIndex: 2,
 						data: [],
 					},
 					{
 						name: "分布电耗",
 						type: "bar",
-						yAxisIndex: 2,
+						yAxisIndex: 3,
 						data: [],
 					},
 				],
@@ -392,19 +400,19 @@ export default {
 					{
 						name: "台时产量",
 						type: "bar",
-						yAxisIndex: 3,
+						yAxisIndex: 1,
 						data: [],
 					},
 					{
 						name: "运转率",
 						type: "line",
-						yAxisIndex: 1,
+						yAxisIndex: 2,
 						data: [],
 					},
 					{
 						name: "分布电耗",
 						type: "bar",
-						yAxisIndex: 2,
+						yAxisIndex: 3,
 						data: [],
 					},
 				],
@@ -447,19 +455,19 @@ export default {
 					{
 						name: "台时产量",
 						type: "bar",
-						yAxisIndex: 0,
+						yAxisIndex: 1,
 						data: [],
 					},
 					{
 						name: "运转率",
 						type: "line",
-						yAxisIndex: 1,
+						yAxisIndex: 2,
 						data: [],
 					},
 					{
 						name: "分布电耗",
 						type: "bar",
-						yAxisIndex: 2,
+						yAxisIndex: 3,
 						data: [],
 					},
 				],
diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue
index d9c2c887..46a986e0 100644
--- a/src/views/enm_kiln/report.vue
+++ b/src/views/enm_kiln/report.vue
@@ -104,11 +104,11 @@
 							v-model="typeRadio"
 							@change="typeRadioChange"
 						>
-							<el-radio-button label="day">小时</el-radio-button>
+							<el-radio-button label="day">按时</el-radio-button>
 							<el-radio-button label="month"
-								>日</el-radio-button
+								>按日</el-radio-button
 							>
-							<el-radio-button label="year">月</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -140,6 +140,7 @@
 							></el-date-picker>
 						</div>
 					</div>
+
 					<div class="chartWrap" v-show="typeRadio == 'day'">
 						<div class="chartTitle">本日生产参数统计图</div>
 						<scEcharts
@@ -287,14 +288,8 @@
 	</div>
 </template>
 <script>
-const colors = [
-	"#647bfe",
-	"#8698fe",
-	"#a9b6fe",
-	"#cbd3fe",
-	"#91CC75",
-	"#EE6666",
-];
+const colors = ["#5b9bd5", "#ed7d31", "#70ad47", "#ffc000", "#5f6694", "#cb9bff"];
+// 产量/台时/运转率/分布电耗/单位产品标煤耗/成本
 let tooltip = {
 	show: true,
 	trigger: "axis",
@@ -306,18 +301,29 @@ let tooltip = {
 	triggerOn: "mousemove",
 };
 let grid = {
-	right: "12%",
-	left: "10%",
+	right: "11%",
+	left: "11%",
 	top: "20%",
 };
 let toolbox = {
-	right: "2%",
+	right: 0,
 	feature: {
 		dataView: { show: true, readOnly: false },
 		saveAsImage: { show: true },
 	},
+	orient: "vertical",
 };
 let legend = {
+	selector: [
+		{
+			type: 'all',
+			title: '全选'
+		},
+		{
+			type: 'inverse',
+			title: '反选'
+		}
+	],
 	top: "2%",
 	data: [
 		"总产量",
@@ -334,7 +340,7 @@ let yAxis = [
 		name: "产量 (t)",
 		position: "left",
 		alignTicks: true,
-		nameRotate: 30,
+		nameRotate: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -345,14 +351,30 @@ let yAxis = [
 			formatter: "{value}",
 		},
 	},
+	{
+		type: "value",
+		name: "台时产量 (t/h)",
+		position: "left",
+		alignTicks: true,
+		nameRotate: 50,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[1],
+			},
+		},
+		offset: 100,
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
 	{
 		type: "value",
 		name: "运转率(%) ",
 		position: "right",
 		alignTicks: true,
-		nameRotate: 30,
-		offset: 120,
-		max:100,
+		nameRotate: 50,
+		offset: 100,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -368,7 +390,7 @@ let yAxis = [
 		name: "分布电耗(kW·h/t)",
 		position: "right",
 		alignTicks: true,
-		nameRotate: 30,
+		nameRotate: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -384,8 +406,8 @@ let yAxis = [
 		name: "标煤耗(kgce/t)",
 		position: "right",
 		alignTicks: true,
-		nameRotate: 30,
-		offset: 60,
+		nameRotate: 50,
+		offset: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -401,8 +423,8 @@ let yAxis = [
 		name: "成本(元/吨)",
 		position: "left",
 		alignTicks: true,
-		nameRotate: 30,
-		offset: 60,
+		nameRotate: 50,
+		offset: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -469,15 +491,7 @@ export default {
 				tooltip: tooltip,
 				grid: grid,
 				toolbox: toolbox,
-				legend: {
-					top: "2%",
-					data: [
-						"总产量",
-						"分布电耗",
-						"单位产品标煤耗",
-						"成本",
-					],
-				},
+				legend:  Object.assign(legend, {data: ["总产量", "分布电耗", "单位产品标煤耗", "成本"]}),
 				xAxis: {
 					axisTick: {
 						show: true,
@@ -565,31 +579,31 @@ export default {
 					{
 						name: "台时产量",
 						type: "bar",
-						yAxisIndex: 0,
+						yAxisIndex: 1,
 						data: [],
 					},
 					{
 						name: "运转率",
 						type: "line",
-						yAxisIndex: 1,
+						yAxisIndex: 2,
 						data: [],
 					},
 					{
 						name: "分布电耗",
 						type: "bar",
-						yAxisIndex: 2,
+						yAxisIndex: 3,
 						data: [],
 					},
 					{
 						name: "单位产品标煤耗",
 						type: "bar",
-						yAxisIndex: 3,
+						yAxisIndex: 4,
 						data: [],
 					},
 					{
 						name: "成本",
 						type: "bar",
-						yAxisIndex: 4,
+						yAxisIndex: 5,
 						data: [],
 					},
 				],
@@ -619,31 +633,31 @@ export default {
 					{
 						name: "台时产量",
 						type: "bar",
-						yAxisIndex: 0,
+						yAxisIndex: 1,
 						data: [],
 					},
 					{
 						name: "运转率",
 						type: "line",
-						yAxisIndex: 1,
+						yAxisIndex: 2,
 						data: [],
 					},
 					{
 						name: "分布电耗",
 						type: "bar",
-						yAxisIndex: 2,
+						yAxisIndex: 3,
 						data: [],
 					},
 					{
 						name: "单位产品标煤耗",
 						type: "bar",
-						yAxisIndex: 3,
+						yAxisIndex: 4,
 						data: [],
 					},
 					{
 						name: "成本",
 						type: "bar",
-						yAxisIndex: 4,
+						yAxisIndex: 5,
 						data: [],
 					},
 				],
diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue
index f83f1d27..46fbfe0e 100644
--- a/src/views/enm_mill/report.vue
+++ b/src/views/enm_mill/report.vue
@@ -93,9 +93,9 @@
 							v-model="typeRadio"
 							@change="typeRadioChange"
 						>
-							<el-radio-button label="day">小时</el-radio-button>
-							<el-radio-button label="month">日</el-radio-button>
-							<el-radio-button label="year">月</el-radio-button>
+							<el-radio-button label="day">按时</el-radio-button>
+							<el-radio-button label="month">按日</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -274,14 +274,7 @@
 	</div>
 </template>
 <script>
-const colors = [
-	"#647bfe",
-	"#8698fe",
-	"#a9b6fe",
-	"#cbd3fe",
-	"#91CC75",
-	"#EE6666",
-];
+const colors = ["#5b9bd5", "#ed7d31", "#70ad47", "#ffc000", "#cb9bff"];
 let tooltip = {
 	show: true,
 	trigger: "axis",
@@ -305,6 +298,16 @@ let toolbox = {
 	},
 };
 let legend = {
+	selector: [
+		{
+			type: 'all',
+			title: '全选'
+		},
+		{
+			type: 'inverse',
+			title: '反选'
+		}
+	],
 	top: "2%",
 	data: ["总产量", "台时产量", "运转率", "分布电耗", "成本"],
 };
@@ -428,10 +431,7 @@ export default {
 				tooltip: tooltip,
 				grid: grid,
 				toolbox: toolbox,
-				legend: {
-					top: "2%",
-					data: ["总产量", "分布电耗", "成本"],
-				},
+				legend:  Object.assign(legend, {data: ["总产量", "分布电耗", "成本"]}),
 				xAxis: {
 					axisTick: {
 						show: true,
diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue
index 6984f86a..ee3040c6 100644
--- a/src/views/enm_pack/report.vue
+++ b/src/views/enm_pack/report.vue
@@ -73,8 +73,8 @@
 							v-model="typeRadio"
 							@change="typeRadioChange"
 						>
-							<el-radio-button label="month">日</el-radio-button>
-							<el-radio-button label="year">月</el-radio-button>
+							<el-radio-button label="month">按日</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -244,7 +244,7 @@
 	</div>
 </template>
 <script>
-const colors = ["#647bfe", "#cbd3fe", "#91CC75", "#EE6666", "#CC00CC", "#551e13"];
+const colors = ["#5b9bd5", "#cbd3fe", "#91CC75", "#EE6666", "#CC00CC", "#551e13"];
 let tooltip = {
 	show: true,
 	trigger: "axis",
@@ -256,18 +256,29 @@ let tooltip = {
 	triggerOn: "mousemove",
 };
 let grid = {
-	right: "4%",
-	left: "4%",
-	top: "15%",
+	right: "11%",
+	left: "11%",
+	top: "24%",
 };
 let toolbox = {
-	right: "2%",
+	right: 0,
 	feature: {
 		dataView: { show: true, readOnly: false },
 		saveAsImage: { show: true },
 	},
+	orient: "vertical",
 };
 let legend = {
+	selector: [
+		{
+			type: 'all',
+			title: '全选'
+		},
+		{
+			type: 'inverse',
+			title: '反选'
+		}
+	],
 	top: "2%",
 	data: ["袋装合计", "散装合计", "熟料出厂合计", "出厂水泥合计", "复合水泥合计"],}
 
@@ -286,6 +297,7 @@ let yAxis = [
 		axisLabel: {
 			formatter: "{value}",
 		},
+		nameRotate: 50,
 	},
 	{
 		type: "value",
@@ -301,6 +313,7 @@ let yAxis = [
 		axisLabel: {
 			formatter: "{value}",
 		},
+		nameRotate: 50,
 	},
 ];
 import scEcharts from "@/components/scEcharts";
diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue
index 37813ad5..7ffaf633 100644
--- a/src/views/enm_rm/report.vue
+++ b/src/views/enm_rm/report.vue
@@ -91,11 +91,11 @@
 							v-model="typeRadio"
 							@change="typeRadioChange"
 						>
-							<el-radio-button label="day">本日</el-radio-button>
+							<el-radio-button label="day">按时</el-radio-button>
 							<el-radio-button label="month"
-								>本月</el-radio-button
+								>按日</el-radio-button
 							>
-							<el-radio-button label="year">本年</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -275,14 +275,7 @@
 	</div>
 </template>
 <script>
-const colors = [
-	"#17E8EF",
-	"#FFECA1",
-	"#3F662F",
-	"#BC1012",
-	"#4AE20D",
-	"#EFC3CA",
-];
+const colors = ["#5b9bd5", "#ed7d31", "#70ad47", "#ffc000", "#4472c4", "#91d024"];
 let tooltip = {
 	show: true,
 	trigger: "axis",
@@ -297,16 +290,27 @@ let tooltip = {
 let grid = {
 	right: "11%",
 	left: "11%",
-	top: "15%",
+	top: "20%",
 };
 let toolbox = {
-	right: "2%",
+	right: 0,
 	feature: {
 		dataView: { show: true, readOnly: false },
 		saveAsImage: { show: true },
 	},
+	orient: "vertical",
 };
 let legend = {
+	selector: [
+		{
+			type: 'all',
+			title: '全选'
+		},
+		{
+			type: 'inverse',
+			title: '反选'
+		}
+	],
 	top: "2%",
 	data: ["总产量", "台时产量", "运转率", "分布电耗"],
 };
@@ -325,13 +329,31 @@ let yAxis = [
 		axisLabel: {
 			formatter: "{value}",
 		},
+		nameRotate: 50
+	},
+	{
+		type: "value",
+		name: "台时产量 (t/h)",
+		position: "left",
+		alignTicks: true,
+		nameRotate: 50,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[1],
+			},
+		},
+		offset: 50,
+		axisLabel: {
+			formatter: "{value}",
+		},
 	},
 	{
 		type: "value",
 		name: "运转率 (%)",
 		position: "right",
 		alignTicks: true,
-		offset: 80,
+		offset: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -341,6 +363,7 @@ let yAxis = [
 		axisLabel: {
 			formatter: "{value}",
 		},
+		nameRotate: 50
 	},
 	{
 		type: "value",
@@ -356,6 +379,7 @@ let yAxis = [
 		axisLabel: {
 			formatter: "{value}",
 		},
+		nameRotate: 50
 	},
 ];
 import * as echarts from "echarts";
@@ -409,10 +433,7 @@ export default {
 				tooltip: tooltip,
 				grid: grid,
 				toolbox: toolbox,
-				legend: {
-					top: "2%",
-					data: ["总产量", "分布电耗"],
-				},
+				legend: Object.assign(legend, {data: ["总产量", "分布电耗"]}),
 				xAxis: {
 					axisTick: {
 						show: true,
diff --git a/src/views/enm_rm_copy/report.vue b/src/views/enm_rm_copy/report.vue
index 87b0998d..8bb99863 100644
--- a/src/views/enm_rm_copy/report.vue
+++ b/src/views/enm_rm_copy/report.vue
@@ -91,11 +91,11 @@
 							v-model="typeRadio"
 							@change="typeRadioChange"
 						>
-							<el-radio-button label="day">本日</el-radio-button>
+							<el-radio-button label="day">按时</el-radio-button>
 							<el-radio-button label="month"
-								>本月</el-radio-button
+								>按日</el-radio-button
 							>
-							<el-radio-button label="year">本年</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -275,14 +275,7 @@
 	</div>
 </template>
 <script>
-const colors = [
-	"#647bfe",
-	"#8698fe",
-	"#a9b6fe",
-	"#cbd3fe",
-	"#91CC75",
-	"#EE6666",
-];
+const colors = ["#5b9bd5", "#ed7d31", "#70ad47", "#ffc000", "#cb9bff"];
 let tooltip = {
 	show: true,
 	trigger: "axis",
@@ -297,14 +290,15 @@ let tooltip = {
 let grid = {
 	right: "10%",
 	left: "10%",
-	top: "15%",
+	top: "20%",
 };
 let toolbox = {
-	right: "2%",
+	right: 0,
 	feature: {
 		dataView: { show: true, readOnly: false },
 		saveAsImage: { show: true },
 	},
+	orient: "vertical",
 };
 let legend = {
 	top: "2%",
@@ -325,13 +319,31 @@ let yAxis = [
 		axisLabel: {
 			formatter: "{value}",
 		},
+		nameRotate: 50
+	},
+	{
+		type: "value",
+		name: "台时产量 (t/h)",
+		position: "left",
+		alignTicks: true,
+		nameRotate: 50,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[1],
+			},
+		},
+		offset: 100,
+		axisLabel: {
+			formatter: "{value}",
+		},
 	},
 	{
 		type: "value",
 		name: "运转率 (%)",
 		position: "right",
 		alignTicks: true,
-		offset: 80,
+		offset: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -341,6 +353,7 @@ let yAxis = [
 		axisLabel: {
 			formatter: "{value}",
 		},
+		nameRotate: 50
 	},
 	{
 		type: "value",
@@ -356,13 +369,14 @@ let yAxis = [
 		axisLabel: {
 			formatter: "{value}",
 		},
+		nameRotate: 50
 	},
 	{
 		type: "value",
 		name: "成本(元/吨)",
 		position: "left",
 		alignTicks: true,
-		offset: 70,
+		offset: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -372,6 +386,7 @@ let yAxis = [
 		axisLabel: {
 			formatter: "{value}",
 		},
+		nameRotate: 50
 	},
 ];
 import * as echarts from "echarts";
@@ -449,25 +464,25 @@ export default {
 					{
 						name: "台时产量",
 						type: "bar",
-						yAxisIndex: 0,
+						yAxisIndex: 1,
 						data: [],
 					},
 					{
 						name: "运转率",
 						type: "line",
-						yAxisIndex: 1,
+						yAxisIndex: 2,
 						data: [],
 					},
 					{
 						name: "分布电耗",
 						type: "bar",
-						yAxisIndex: 2,
+						yAxisIndex: 3,
 						data: [],
 					},
 					{
 						name: "成本",
 						type: "bar",
-						yAxisIndex: 3,
+						yAxisIndex: 4,
 						data: [],
 					},
 				],
@@ -511,25 +526,25 @@ export default {
 					{
 						name: "台时产量",
 						type: "bar",
-						yAxisIndex: 0,
+						yAxisIndex: 1,
 						data: [],
 					},
 					{
 						name: "运转率",
 						type: "line",
-						yAxisIndex: 1,
+						yAxisIndex: 2,
 						data: [],
 					},
 					{
 						name: "分布电耗",
 						type: "bar",
-						yAxisIndex: 2,
+						yAxisIndex: 3,
 						data: [],
 					},
 					{
 						name: "成本",
 						type: "bar",
-						yAxisIndex: 3,
+						yAxisIndex: 4,
 						data: [],
 					},
 				],
@@ -573,7 +588,7 @@ export default {
 					{
 						name: "台时产量",
 						type: "bar",
-						yAxisIndex: 0,
+						yAxisIndex: 1,
 						data: [],
 					},
 					{
diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue
index 6791abfd..91985982 100644
--- a/src/views/enm_slag/report.vue
+++ b/src/views/enm_slag/report.vue
@@ -84,9 +84,9 @@
 							@change="typeRadioChange"
 						>
 							<el-radio-button label="month"
-								>日</el-radio-button
+								>按日</el-radio-button
 							>
-							<el-radio-button label="year">月</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -251,7 +251,7 @@
 <script>
 import scEcharts from "@/components/scEcharts";
 import { defineAsyncComponent } from "vue";
-const colors = ["#647bfe", "#cbd3fe", "#91CC75", "#EE6666", "#CC00CC", "#551e13"];
+const colors = ["#5b9bd5", "#ffc000", "#ed7d31", "#cb9bff", "#4472c4", "#91d024"];
 let tooltip = {
 	show: true,
 	trigger: "axis",
@@ -268,13 +268,24 @@ let grid = {
 	top: "20%",
 };
 let toolbox = {
-	right: "5%",
+	right: 0,
 	feature: {
 		dataView: { show: true, readOnly: false },
 		saveAsImage: { show: true },
 	},
+	orient: "vertical",
 };
 let legend = {
+	selector: [
+		{
+			type: 'all',
+			title: '全选'
+		},
+		{
+			type: 'inverse',
+			title: '反选'
+		}
+	],
 	top: "2%",
 	data: ["总产量", "分布电耗", "总电量", "成本", "消耗", "进厂"],
 };
@@ -284,7 +295,7 @@ let yAxis = [
 		name: "总产量 (t)",
 		position: "left",
 		alignTicks: true,
-		nameRotate: 45,
+		nameRotate: 50,
 		axisLine: {
 			show: true,
 			lineStyle: {
@@ -297,7 +308,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		nameRotate: 45,
+		nameRotate: 50,
 		name: "分布电耗(kW·h/t)",
 		position: "left",
 		alignTicks: true,
@@ -314,7 +325,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		nameRotate: 45,
+		nameRotate: 50,
 		name: "总电量(kW·h)",
 		position: "left",
 		alignTicks: true,
@@ -332,7 +343,7 @@ let yAxis = [
 	
 	{
 		type: "value",
-		nameRotate: 45,
+		nameRotate: 50,
 		name: "成本(元/t)",
 		position: "right",
 		alignTicks: true,
@@ -351,7 +362,7 @@ let yAxis = [
 		name: "消耗(t)",
 		position: "right",
 		alignTicks: true,
-		nameRotate: 45,
+		nameRotate: 50,
 		offset: 50,
 		axisLine: {
 			show: true,
@@ -368,7 +379,7 @@ let yAxis = [
 		name: "进厂(t)",
 		position: "right",
 		alignTicks: true,
-		nameRotate: 45,
+		nameRotate: 50,
 		offset: 100,
 		axisLine: {
 			show: true,

From a55b5612a4d31254cbbf9b40b33199b9c5c7d378 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 30 Dec 2024 14:05:39 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E9=80=80=E5=87=BA=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_enm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 311f1f55..506367dd 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -4,7 +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>
+			<div class="backHomeBtn" style="right: 100px;" @click.prevent="backHome">退出大屏</div>
 		</header>
 		<div id="model" class="model">
 			<div class="top_block">
@@ -709,7 +709,7 @@ export default {
 	methods: {
 		backHome(){
 			// this.$router.push({ name: "user" });
-			window.location.href =  "http://tkx.xxhhcty.xyz:8080/#/dashboard_enm";
+			this.$router.go(-1);
 		},
 		initializeData() {
 			this.productNum();

From 574431ccb5d0a447f832c2ca53c202f3296f3732 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Mon, 30 Dec 2024 14:07:03 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=B0=B4=20?=
 =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E7=A9=BA=E6=B0=94=EF=BC=8C=E7=94=B5=E9=87=8F?=
 =?UTF-8?q?=E7=9A=84=20=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_enm.vue       |  2 +-
 src/views/enm_energy/air_consume.vue    | 43 ++++++++------
 src/views/enm_energy/electric_total.vue | 27 ++++-----
 src/views/enm_energy/water.vue          | 75 ++++++++++++++-----------
 4 files changed, 79 insertions(+), 68 deletions(-)

diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 311f1f55..c1fbd0df 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -160,7 +160,7 @@
 			<div class="flexItem">
 				<div class="itemTitle">
 					<div class="itemTitleIcon"></div>
-					<div>本月主机设备电耗</div>
+					<div>本月工序电量</div>
 				</div>
 				<div class="itemBody itemBodyFlex">
 					<div id="radar" style="height: 100%"></div>
diff --git a/src/views/enm_energy/air_consume.vue b/src/views/enm_energy/air_consume.vue
index ed1aaeb3..65bde809 100644
--- a/src/views/enm_energy/air_consume.vue
+++ b/src/views/enm_energy/air_consume.vue
@@ -17,19 +17,18 @@
                     :value="item.id"
                     ></el-option>
 				</el-select>
-				<el-date-picker
-					v-model="daterange"
-					type="datetimerange"
-					:shortcuts="shortcuts"
-					range-separator="To"
-      				start-placeholder="Start date"
-					end-placeholder="End date"
-					placeholder="时间范围"
-					value-format="YYYY-MM-DD hh:mm:ss"
+				<el-date-picker 
+					v-model="daterange" 
+					type="datetimerange" 
+					value-format="YYYY-MM-DD HH:mm:ss" 
+					range-separator="至"
+					start-placeholder="开始时间" 
+					end-placeholder="结束时间"
+					format="YYYY-MM-DD HH"
+                    popper-class="tpc"
 					v-if="query.type==3"
-					style="margin-right: 6px"
-					@change="changeDate"
-				/>
+					@change="changeDate"/>
+					
 				<el-date-picker
 					v-model="query.day"
 					type="date"
@@ -397,7 +396,7 @@ export default {
 			bar_option: {
 			legend: {
 					top: "2%",
-					data: ["烧成车间压缩空气", "原料车间压缩空气", "水泥磨压缩空气"]
+					data: ["烧成车间压缩空气(m3)", "原料车间压缩空气(m3)", "水泥磨压缩空气(m3)"]
 				},
 			tooltip: {
 				trigger: 'axis',
@@ -411,11 +410,11 @@ export default {
 			},
 			yAxis: {
 				type: 'value',
-				name: '压缩空气'
+				name: ''
 			},
 			series: [
 				{
-				name: '烧成车间压缩空气', // 此处修改为对应分类的名称
+				name: '烧成车间压缩空气(m3)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: [], 
 				itemStyle: {
@@ -424,7 +423,7 @@ export default {
 				
 			},
 			{
-				name: '原料车间压缩空气', // 此处修改为对应分类的名称
+				name: '原料车间压缩空气(m3)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: [], 
 				itemStyle: {
@@ -433,7 +432,7 @@ export default {
 				
 			},
 			{
-				name: '水泥磨压缩空气', // 此处修改为对应分类的名称
+				name: '水泥磨压缩空气(m3)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: [], 
 				itemStyle: {
@@ -869,13 +868,23 @@ export default {
 		},
 	}
 };
+
 </script>
 <style scoped>
 .printWrap {
 	width: 100%;
 	overflow-x: scroll;
 }
+.chartWrap {
+	width: 1500px;
+	margin-top: 20px;
+	border: 1px solid #eeeeee;
+}
 .printContainer {
 	width: 100%;
 }
+.chartTitle{
+	text-align: center; 
+    width: 100%; 
+}
 </style>
diff --git a/src/views/enm_energy/electric_total.vue b/src/views/enm_energy/electric_total.vue
index 09ad7bab..f392c2f6 100644
--- a/src/views/enm_energy/electric_total.vue
+++ b/src/views/enm_energy/electric_total.vue
@@ -26,24 +26,17 @@
 					v-if = "query.type == 0"	
 					@change="dateChange"
 				/>
-				<el-date-picker
-					v-model="daterange"
-					type="datetimerange"
-					:shortcuts="shortcuts"
-					range-separator="To"
-      				start-placeholder="Start date"
-					end-placeholder="End date"
-					placeholder="时间范围"
-					value-format="YYYY-MM-DD hh:mm:ss"
+				<el-date-picker 
+					v-model="daterange" 
+					type="datetimerange" 
+					value-format="YYYY-MM-DD HH:mm:ss" 
+					range-separator="至"
+					start-placeholder="开始时间" 
+					end-placeholder="结束时间"
+					format="YYYY-MM-DD HH"
+                    popper-class="tpc"
 					v-if="query.type==1"
-					style="margin-right: 6px"
-					@change="changeDate"
-				/>
-				<!-- <el-button
-					type="primary"
-					icon="el-icon-search"
-					@click="dateChange"
-				></el-button> -->
+					@change="changeDate"/>
 				<el-button
 					type="primary"
 					@click="exportExcel()"
diff --git a/src/views/enm_energy/water.vue b/src/views/enm_energy/water.vue
index d8fdab10..98d1ad70 100644
--- a/src/views/enm_energy/water.vue
+++ b/src/views/enm_energy/water.vue
@@ -17,19 +17,18 @@
                     :value="item.id"
                     ></el-option>
 				</el-select>
-				<el-date-picker
-					v-model="daterange"
-					type="datetimerange"
-					:shortcuts="shortcuts"
-					range-separator="To"
-      				start-placeholder="Start date"
-					end-placeholder="End date"
-					placeholder="时间范围"
-					value-format="YYYY-MM-DD hh:mm:ss"
+                <el-date-picker 
+					v-model="daterange" 
+					type="datetimerange" 
+					value-format="YYYY-MM-DD HH:mm:ss" 
+					range-separator="至"
+					start-placeholder="开始时间" 
+					end-placeholder="结束时间"
+					format="YYYY-MM-DD HH"
+                    popper-class="tpc"
 					v-if="query.type==3"
-					style="margin-right: 6px"
-					@change="changeDate"
-				/>
+					@change="changeDate"/>
+
 				<el-date-picker
 					v-model="query.day"
 					type="date"
@@ -243,8 +242,9 @@
 <script>
 let legend = {
 	top: "2%",
-	data: ["工业水", "绿化水", "生活水"],
+	data: ["工业水(t)", "绿化水(t)", "生活水(t)"],
 };
+let colors = ["##36492E", "#4BA328", "#C6F47D"];
 import scEcharts from "@/components/scEcharts";
 export default {
 	components: {
@@ -303,7 +303,6 @@ export default {
 			sourceData: {},
 			option: {
 				title: {
-					// text: "全厂电量小时统计",
 					x: "center",
 				},
 				grid: {
@@ -423,6 +422,7 @@ export default {
 		for (let n = 1; n <= that.days; n++) {
 			that.xAxisData_day.push(n + "日");
 		}
+		let colors = ["##36492E", "#4BA328", "#C6F47D"];
 		this.getMPoints();
 		let heightContainer =
 			document.getElementById("app-container").clientHeight;
@@ -590,7 +590,7 @@ export default {
 			});
 		},
 		updateChart(gyhourlyData, shhourlyData, lvhourlyData) {
-			let that = this;
+		let that = this;
 			// 创建 ECharts 配置
 		let option = {
 			legend: legend,
@@ -606,32 +606,32 @@ export default {
 			},
 			yAxis: {
 				type: 'value',
-				name: '用水量'
+				name: ''
 			},
 			series: [{
-				name: '工业水', // 此处修改为对应分类的名称
+				name: '工业水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: gyhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#a9b6fe',
+					color: '#518A3A',
 				},
 				
 			},
 			{
-				name: '绿化水', // 此处修改为对应分类的名称
+				name: '绿化水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: lvhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#3398DB',
+					color: '#DCE6CB',
 				},
 				
 			},
 			{
-				name: '生活水', // 此处修改为对应分类的名称
+				name: '生活水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: shhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#EE6666',
+					color: '#93F607',
 				},
 				
 			},
@@ -707,32 +707,32 @@ export default {
 			},
 			yAxis: {
 				type: 'value',
-				name: '用水量'
+				name: ''
 			},
 			series: [{
-				name: '工业水', // 此处修改为对应分类的名称
+				name: '工业水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: gyhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#a9b6fe',
+					color: '#518A3A',
 				},
 				
 			},
 			{
-				name: '绿化水', // 此处修改为对应分类的名称
+				name: '绿化水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: lvhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#3398DB',
+					color: '#DCE6CB',
 				},
 				
 			},
 			{
-				name: '生活水', // 此处修改为对应分类的名称
+				name: '生活水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: shhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#EE6666',
+					color: '#93F607',
 				},
 				
 			},
@@ -837,14 +837,14 @@ export default {
 			},
 			yAxis: {
 				type: 'value',
-				name: '用水量'
+				name: ''
 			},
 			series: [{
 				name: '工业水', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: gyhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#a9b6fe',
+					color: '#518A3A',
 				},
 				
 			},
@@ -853,7 +853,7 @@ export default {
 				type: 'bar',
 				data: lvhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#3398DB',
+					color: '#DCE6CB',
 				},
 				
 			},
@@ -862,7 +862,7 @@ export default {
 				type: 'bar',
 				data: shhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#EE6666',
+					color: '#93F607',
 				},
 				
 			},
@@ -964,4 +964,13 @@ export default {
 .printContainer {
 	width: 100%;
 }
+.chartTitle{
+	text-align: center; 
+    width: 100%; 
+}
+.chartWrap {
+	width: 1500px;
+	margin-top: 20px;
+	border: 1px solid #eeeeee;
+}
 </style>

From 022d95e3d8d13b53c6aa4091ceafee92f6b713a3 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 30 Dec 2024 15:04:18 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E4=B8=BB=E8=A6=81=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_coal/power.vue | 20 +++++++++++++-------
 src/views/enm_kiln/power.vue | 22 ++++++++++++++--------
 src/views/enm_mill/power.vue | 25 ++++++++++++++++---------
 src/views/enm_rm/power.vue   | 19 ++++++++++++-------
 src/views/enm_slag/power.vue | 15 +++++++--------
 5 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/src/views/enm_coal/power.vue b/src/views/enm_coal/power.vue
index 5db2f69d..efa3363d 100644
--- a/src/views/enm_coal/power.vue
+++ b/src/views/enm_coal/power.vue
@@ -80,11 +80,11 @@
 							v-model="typeRadio"
 							@change="typeRadioChange"
 						>
-							<el-radio-button label="day">本日</el-radio-button>
+							<el-radio-button label="day">按时</el-radio-button>
 							<el-radio-button label="month"
-								>本月</el-radio-button
+								>按日</el-radio-button
 							>
-							<el-radio-button label="year">本年</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -371,9 +371,10 @@ export default {
 			obj.mgroup__name = "煤磨";
 			obj.page = 0;
 			obj.enabled = 1;
-			obj.need_display = 1;
+			// obj.need_display = 1;
 			obj.ordering = "report_sortstr";
 			obj.material__code__in = "elec,elec_0";
+			obj.ep_monitored__power_kw__gte = 100;
 			this.$API.enm.mpoint.list.req(obj).then((res) => {
 				const arr = res.filter(item => item.name !== "烧成车间合计").map(item => item.name)
 				that.mpoints = arr;
@@ -418,7 +419,8 @@ export default {
 			obj.hour = hours_h;
 			obj.mgroup__name = "煤磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat
 				.req(obj)
@@ -484,6 +486,7 @@ export default {
 						obj_m.mgroup__name = "煤磨";
 						obj_m.mpoint__material__code__in = "elec,elec_0";
 						obj_m.mpoint__need_display = 1;
+						obj_m.mpoint__ep_monitored__power_kw__gte = 100;
 						obj_m.page = 0;
 						this.$API.enm.mpoint.stat.req(obj_m).then((res) => {
 							console.log("getTableHourData", res);
@@ -520,6 +523,7 @@ export default {
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__ep_monitored__isnull = 0;
 			obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
@@ -566,7 +570,8 @@ export default {
 			obj.mgroup__name = "煤磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
@@ -613,7 +618,8 @@ export default {
 			obj.mgroup__name = "煤磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
diff --git a/src/views/enm_kiln/power.vue b/src/views/enm_kiln/power.vue
index a2f3f384..00af3c62 100644
--- a/src/views/enm_kiln/power.vue
+++ b/src/views/enm_kiln/power.vue
@@ -80,11 +80,11 @@
 							v-model="typeRadio"
 							@change="typeRadioChange"
 						>
-							<el-radio-button label="day">本日</el-radio-button>
+							<el-radio-button label="day">按时</el-radio-button>
 							<el-radio-button label="month"
-								>本月</el-radio-button
+								>按日</el-radio-button
 							>
-							<el-radio-button label="year">本年</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -485,6 +485,7 @@ export default {
 			obj.material__code__in = "elec,elec_0";
 			obj.need_display = 1;
 			obj.ordering = "report_sortstr";
+			obj.ep_monitored__power_kw__gte = 100;
 			this.$API.enm.mpoint.list.req(obj).then((res) => {
 				console.log("mpoints", res);
 				let arr = [];
@@ -538,7 +539,8 @@ export default {
 			obj.hour = hours_h;
 			obj.mgroup__name = "回转窑";
 			obj.mpoint__material__code__in = "elec,elec_0";
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat
 				.req(obj)
@@ -601,7 +603,8 @@ export default {
 						obj_m.month_s = that.month;
 						obj_m.mgroup__name = "回转窑";
 						obj_m.mpoint__material__code__in = "elec,elec_0";
-						obj_m.mpoint__need_display = 1;
+						// obj_m.mpoint__need_display = 1;
+						obj.mpoint__ep_monitored__power_kw__gte = 100;
 						obj_m.page = 0;
 						this.$API.enm.mpoint.stat.req(obj_m).then((res) => {
 							console.log("getTableHourData", res);
@@ -638,7 +641,8 @@ export default {
 			obj.mgroup__name = "回转窑";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
@@ -679,7 +683,8 @@ export default {
 			obj.mgroup__name = "回转窑";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// // obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
@@ -720,7 +725,8 @@ export default {
 			obj.mgroup__name = "回转窑";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
diff --git a/src/views/enm_mill/power.vue b/src/views/enm_mill/power.vue
index 37f75cb6..743f6bc6 100644
--- a/src/views/enm_mill/power.vue
+++ b/src/views/enm_mill/power.vue
@@ -80,11 +80,11 @@
 							v-model="typeRadio"
 							@change="typeRadioChange"
 						>
-							<el-radio-button label="day">本日</el-radio-button>
+							<el-radio-button label="day">按时</el-radio-button>
 							<el-radio-button label="month"
-								>本月</el-radio-button
+								>按日</el-radio-button
 							>
-							<el-radio-button label="year">本年</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -446,6 +446,7 @@ export default {
 			obj.need_display = 1;
 			obj.ordering = "report_sortstr";
 			obj.material__code__in = "elec,elec_0";
+			obj.ep_monitored__power_kw__gte = 100;
 			this.$API.enm.mpoint.list.req(obj).then((res) => {
 				console.log("mpoints", res);
 				let arr = [];
@@ -495,7 +496,8 @@ export default {
 			obj.hour = hours_h;
 			obj.mgroup__name = "水泥磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat
 				.req(obj)
@@ -529,7 +531,8 @@ export default {
 					obj_d.day_s = days_d;
 					obj_d.mgroup__name = "水泥磨";
 					obj_d.mpoint__material__code__in = "elec,elec_0";
-					obj_d.mpoint__need_display = 1;
+					// obj_d.mpoint__need_display = 1;
+					obj_d.mpoint__ep_monitored__power_kw__gte = 100;
 					obj_d.page = 0;
 					this.$API.enm.mpoint.stat.req(obj_d).then((res) => {
 						console.log("getTableHourData", res);
@@ -556,7 +559,8 @@ export default {
 						obj_m.month_s = that.month;
 						obj_m.mgroup__name = "水泥磨";
 						obj_m.mpoint__material__code__in = "elec,elec_0";
-						obj_m.mpoint__need_display = 1;
+						// obj_m.mpoint__need_display = 1;
+						obj_m.mpoint__ep_monitored__power_kw__gte = 100;
 						obj_m.page = 0;
 						this.$API.enm.mpoint.stat.req(obj_m).then((res) => {
 							console.log("getTableHourData", res);
@@ -593,7 +597,8 @@ export default {
 			obj.mgroup__name = "水泥磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
@@ -637,7 +642,8 @@ export default {
 			obj.mgroup__name = "水泥磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
@@ -681,7 +687,8 @@ export default {
 			obj.mgroup__name = "水泥磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
diff --git a/src/views/enm_rm/power.vue b/src/views/enm_rm/power.vue
index 3851cd24..7eadcba4 100644
--- a/src/views/enm_rm/power.vue
+++ b/src/views/enm_rm/power.vue
@@ -80,11 +80,11 @@
 							v-model="typeRadio"
 							@change="typeRadioChange"
 						>
-							<el-radio-button label="day">本日</el-radio-button>
+							<el-radio-button label="day">按时</el-radio-button>
 							<el-radio-button label="month"
-								>本月</el-radio-button
+								>按日</el-radio-button
 							>
-							<el-radio-button label="year">本年</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -424,6 +424,7 @@ export default {
 			obj.need_display = 1;
 			obj.ordering = "report_sortstr";
 			obj.material__code__in = "elec,elec_0";
+			obj.ep_monitored__power_kw__gte = 100;
 			this.$API.enm.mpoint.list.req(obj).then((res) => {
 				const arr = res.filter(item => item.name !== "原料车间合计").map(item => item.name)		
 				console.log("arr", arr);
@@ -469,7 +470,8 @@ export default {
 			obj.hour = hours_h;
 			obj.mgroup__name = "原料磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat
 				.req(obj)
@@ -575,7 +577,8 @@ export default {
 			obj.mgroup__name = "原料磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
@@ -622,7 +625,8 @@ export default {
 			obj.mgroup__name = "原料磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
@@ -671,7 +675,8 @@ export default {
 			obj.mgroup__name = "原料磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			// obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
diff --git a/src/views/enm_slag/power.vue b/src/views/enm_slag/power.vue
index 266f28b6..05eb72f4 100644
--- a/src/views/enm_slag/power.vue
+++ b/src/views/enm_slag/power.vue
@@ -79,9 +79,9 @@
 							@change="typeRadioChange"
 						>
 							<el-radio-button label="month"
-								>本月</el-radio-button
+								>按日</el-radio-button
 							>
-							<el-radio-button label="year">本年</el-radio-button>
+							<el-radio-button label="year">按月</el-radio-button>
 						</el-radio-group>
 						<div style="position: absolute; right: 20px">
 							<el-date-picker
@@ -290,6 +290,7 @@ export default {
 			obj.need_display = 1;
 			obj.ordering = "report_sortstr";
 			obj.material__code__in = "elec,elec_0";
+			obj.ep_monitored__power_kw__gte = 100;
 			this.$API.enm.mpoint.list.req(obj).then((res) => {
 				console.log("mpoints", res);
 				let arr = [];
@@ -343,7 +344,7 @@ export default {
 			obj_d.day_s = days_d;
 			obj_d.mgroup__name = "电石渣";
 			obj_d.mpoint__material__code__in = "elec,elec_0";
-			obj_d.mpoint__need_display = 1;
+			obj_d.mpoint__ep_monitored__power_kw__gte = 100;
 			obj_d.page = 0;
 			this.$API.enm.mpoint.stat.req(obj_d).then((res) => {
 				console.log("getTableHourData", res);
@@ -371,7 +372,7 @@ export default {
 				obj_m.month_s = that.month;
 				obj_m.mgroup__name = "电石渣";
 				obj_m.mpoint__material__code__in = "elec,elec_0";
-				obj_m.mpoint__need_display = 1;
+				obj_m.mpoint__ep_monitored__power_kw__gte = 100;
 				obj_m.page = 0;
 				this.$API.enm.mpoint.stat.req(obj_m).then((res) => {
 					console.log("getTableHourData", res);
@@ -408,8 +409,7 @@ export default {
 			obj.month_s = month;
 			obj.mgroup__name = "电石渣";
 			obj.mpoint__material__code__in = "elec,elec_0";
-			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];
@@ -449,8 +449,7 @@ export default {
 			obj.year_s = year;
 			obj.mgroup__name = "电石渣";
 			obj.mpoint__material__code__in = "elec,elec_0";
-			// obj.mpoint__ep_monitored__isnull = 0;
-			obj.mpoint__need_display = 1;
+			obj.mpoint__ep_monitored__power_kw__gte = 100;
 			obj.page = 0;
 			this.$API.enm.mpoint.stat.req(obj).then((response) => {
 				let seriesData = [];

From 3df65b5a2b0b96963c14aab93f9535b2fead83b7 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 30 Dec 2024 15:08:06 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E7=BB=99=E5=AE=9A=E6=97=B6=E9=97=B4=E8=8E=B7=E5=8F=96=E7=8F=AD?=
 =?UTF-8?q?=E5=B9=B4=E6=9C=88=E6=97=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development     | 5 ++++-
 src/api/model/mtm.js | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index 9a475376..523f7a07 100644
--- a/.env.development
+++ b/.env.development
@@ -22,11 +22,14 @@ VUE_APP_PJ = ''
 #  VUE_APP_BASEURL = http://10.50.211.228:2250/
 
 #  VUE_APP_BASEURL = http://127.0.0.1:8887
-# VUE_APP_BASEURL = http://127.0.0.1:2226
+# VUE_APP_BASEURL = http://127.0.0.1:226
 
 # #光子
 VUE_APP_API_BASEURL = http://tkx.xxhhcty.xyz:8080/api
 VUE_APP_BASEURL = http://tkx.xxhhcty.xyz:8080
+
+# VUE_APP_API_BASEURL = http://49.232.14.174:2250/api
+# VUE_APP_BASEURL = http://49.232.14.174:2250
 # 
 # 本地端口
 VUE_APP_PORT = 2800
diff --git a/src/api/model/mtm.js b/src/api/model/mtm.js
index 7566d420..4956036e 100644
--- a/src/api/model/mtm.js
+++ b/src/api/model/mtm.js
@@ -216,6 +216,12 @@ export default {
 				);
 			},
 		},
+		days:{
+			name: "所属年月日",
+			req: async function (data) {
+				return await http.post(`${config.API_URL}/mtm/mgroup/get_days/`, data);
+			},
+		}
 	},
 	//班次
 	shift: {