diff --git a/src/views/enm_coal/power.vue b/src/views/enm_coal/power.vue
index ba7a9974..3717f596 100644
--- a/src/views/enm_coal/power.vue
+++ b/src/views/enm_coal/power.vue
@@ -26,13 +26,13 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="6">
-									煤磨工段主要设备（100KW以上）单位产品电耗数据表
+									煤磨工序主要设备（100KW以上）单位产品电耗数据表
 								</th>
 							</tr>
 							<tr>
 								<th>设备名称</th>
 								<th>设备位号</th>
-								<th>单位</th>
+								<th>单位产品分布电耗</th>
 								<th>上个小时</th>
 								<th>昨日</th>
 								<th>本月</th>
@@ -242,7 +242,7 @@ export default {
 			tableData: [],
 			modelValue: true,
 			type: "hour_s",
-			title: "煤磨工段",
+			title: "煤磨工序",
 			cate: "",
 			apiObj: this.$API.enm.mpoint.stat,
 			showClose: true,
@@ -430,7 +430,7 @@ export default {
 							}
 						let index = that.mpoints.indexOf(item.mpoint_name);
 						let obj = [];
-						obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+						obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 						obj[1] = item.ep_monitored_number;
 						obj[2] = "KW·h/t";
 						obj[3] = item.elec_consume_unit;
@@ -469,7 +469,7 @@ export default {
 									item.elec_consume_unit;
 							} else {
 								let obj = [];
-								obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+								obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 								obj[1] = item.ep_monitored_number;
 								obj[2] = "KW·h/t";
 								obj[4] = item.elec_consume_unit;
@@ -496,7 +496,7 @@ export default {
 										item.elec_consume_unit;
 								} else {
 									let obj = [];
-									obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+									obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 									obj[1] = item.ep_monitored_number;
 									obj[2] = "KW·h/t";
 									obj[5] = item.elec_consume_unit;
diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue
index 795e2e76..bbcf052e 100644
--- a/src/views/enm_coal/report.vue
+++ b/src/views/enm_coal/report.vue
@@ -25,7 +25,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="10">煤磨工段生产报告</th>
+								<th colspan="10">煤磨工序生产报告</th>
 							</tr>
 							<tr>
 								<th colspan="2">参数</th>
@@ -276,7 +276,7 @@ export default {
 			tableName: "生产报告",
 			modelValue: true,
 			type: "hour_s",
-			title: "煤磨工段",
+			title: "煤磨工序",
 			cate: "",
 			apiObj: this.$API.enm.enstat,
 			showClose: true,
diff --git a/src/views/enm_coal/teamAnalysis.vue b/src/views/enm_coal/teamAnalysis.vue
index 218a0356..2c614b58 100644
--- a/src/views/enm_coal/teamAnalysis.vue
+++ b/src/views/enm_coal/teamAnalysis.vue
@@ -38,7 +38,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="16">煤磨工段班组月度对比分析</th>
+								<th colspan="16">煤磨工序班组月度对比分析</th>
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
diff --git a/src/views/enm_coal/workshopAnalysis.vue b/src/views/enm_coal/workshopAnalysis.vue
index 74e8fbfe..01d3c24e 100644
--- a/src/views/enm_coal/workshopAnalysis.vue
+++ b/src/views/enm_coal/workshopAnalysis.vue
@@ -39,7 +39,7 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="8">
-									煤磨工段车间单位产品电耗月度分析表
+									煤磨工序车间单位产品电耗月度分析表
 								</th>
 							</tr>
 							<tr>
diff --git a/src/views/enm_coalbase/power.vue b/src/views/enm_coalbase/power.vue
index 3ca0b8b3..4ead0344 100644
--- a/src/views/enm_coalbase/power.vue
+++ b/src/views/enm_coalbase/power.vue
@@ -235,7 +235,7 @@ export default {
 			tableData: [],
 			modelValue: true,
 			type: "hour_s",
-			title: "煤磨工段",
+			title: "煤磨工序",
 			cate: "",
 			apiObj: this.$API.enm.mpoint.stat,
 			showClose: true,
diff --git a/src/views/enm_coalbase/report.vue b/src/views/enm_coalbase/report.vue
index b14251a4..5c2276c7 100644
--- a/src/views/enm_coalbase/report.vue
+++ b/src/views/enm_coalbase/report.vue
@@ -24,7 +24,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="10">煤磨工段生产报告</th>
+								<th colspan="10">煤磨工序生产报告</th>
 							</tr>
 							<tr>
 								<th colspan="2">参数</th>
@@ -275,7 +275,7 @@ export default {
 			tableName: "生产报告",
 			modelValue: true,
 			type: "hour_s",
-			title: "煤磨工段",
+			title: "煤磨工序",
 			cate: "",
 			apiObj: this.$API.enm.enstat,
 			showClose: true,
diff --git a/src/views/enm_coalbase/teamAnalysis.vue b/src/views/enm_coalbase/teamAnalysis.vue
index c89dff27..b53e9a1f 100644
--- a/src/views/enm_coalbase/teamAnalysis.vue
+++ b/src/views/enm_coalbase/teamAnalysis.vue
@@ -37,7 +37,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="12">煤磨工段班组月度对比分析</th>
+								<th colspan="12">煤磨工序班组月度对比分析</th>
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
diff --git a/src/views/enm_coalbase/workshopAnalysis.vue b/src/views/enm_coalbase/workshopAnalysis.vue
index 57f6279d..df6bb8e2 100644
--- a/src/views/enm_coalbase/workshopAnalysis.vue
+++ b/src/views/enm_coalbase/workshopAnalysis.vue
@@ -38,7 +38,7 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="8">
-									煤磨工段车间单位产品电耗月度分析表
+									煤磨工序车间单位产品电耗月度分析表
 								</th>
 							</tr>
 							<tr>
diff --git a/src/views/enm_cogeneration/report.vue b/src/views/enm_cogeneration/report.vue
index 4c68f0a1..5a73c0fa 100644
--- a/src/views/enm_cogeneration/report.vue
+++ b/src/views/enm_cogeneration/report.vue
@@ -404,7 +404,7 @@ export default {
 			tableName: "生产报告",
 			modelValue: true,
 			type: "hour_s",
-			title: "回转窑工段",
+			title: "烧成工序",
 			cate: "",
 			apiObj: this.$API.enm.enstat,
 			showClose: true,
diff --git a/src/views/enm_energy/electric_total.vue b/src/views/enm_energy/electric_total.vue
index e40b948e..bb6eb745 100644
--- a/src/views/enm_energy/electric_total.vue
+++ b/src/views/enm_energy/electric_total.vue
@@ -66,24 +66,22 @@
 							border
 							:height="tableHeight"
 						>
+						<el-table-column type="index"></el-table-column>
 							<el-table-column
 								label="设备名称"
 								prop="name"
-								
-								fixed
 							>
 							</el-table-column>
 							<el-table-column
 								label="对应点位"
 								prop="code"
-								fixed
 							>
 							</el-table-column>
-							<el-table-column label="日累计" prop="day" align="center" fixed>
+							<el-table-column label="日累计" prop="day" align="center">
 							</el-table-column>
-							<el-table-column label="月累计" prop="month" align="center" fixed>
+							<el-table-column label="月累计" prop="month" align="center">
 							</el-table-column>
-                            <el-table-column label="年累计" prop="year" align="center" fixed>
+                            <el-table-column label="年累计" prop="year" align="center">
 							</el-table-column>
 						</el-table>
 						<el-table
@@ -95,22 +93,20 @@
 							:height="tableHeight"
 							@cell-click="handleCellClick_range"
 						>
+						<el-table-column type="index"></el-table-column>
 							<el-table-column
 								label="设备名称"
 								prop="mpoint__name"
-								fixed
 								align="center"
 							>
 							</el-table-column>
 							<el-table-column
 								label="对应点位"
 								prop="mpoint__code"
-								fixed
 								align="center"
 							></el-table-column><el-table-column
 								label="统计值(kwh)"
 								prop="total_val"
-								fixed
 								align="center"
 							></el-table-column>
 						</el-table>
@@ -283,6 +279,9 @@ export default {
 	},
 	methods: {
 		dateChange(e) {
+			if (e == null) {
+				return
+			}
 			let that = this;
 			that.tableDatas = [];
 			let arr = [];
@@ -301,7 +300,10 @@ export default {
 		formatArry(){
 			this.result = this.mpointIdList.join(","); // 将数组转换为字符串
 		},
-		changeDate(){
+		changeDate(val){
+			if (val == null){
+				return
+			}
 			let that = this;
 			let obj = {};
 			obj.type = "hour";
@@ -334,7 +336,7 @@ export default {
 					that.mpointList = res.filter((item) => {
 						// 提取mpointIdList
 							that.mpointIdList.push(item.id);
-						return item.report_sortstr !== "";
+						return true;
 					});
 					that.dataLoop();
 				});
@@ -355,7 +357,9 @@ export default {
 		},
 		getData(id, index) {
 			let that = this;
-			let obj = {};
+			let obj = {
+				query: "{val}"
+			};
 			obj.type = "day";
 			obj.year = that.year;
 			obj.month = that.month;
@@ -368,7 +372,9 @@ export default {
 				});
 			});
             //月
-            let obj_month = {};
+            let obj_month = {
+				query: "{val}"
+			};
 			obj_month.type = "month";
             obj_month.year = that.year;
 			obj_month.month = that.month;
@@ -380,7 +386,9 @@ export default {
 				});
 			});
             //年
-            let obj_year = {};
+            let obj_year = {
+				query: "{val}"
+			};
 			obj_year.type = "year";
             obj_year.year = that.year;
 			obj_year.mpoint = id;
diff --git a/src/views/enm_kiln/power.vue b/src/views/enm_kiln/power.vue
index de709496..0b76b350 100644
--- a/src/views/enm_kiln/power.vue
+++ b/src/views/enm_kiln/power.vue
@@ -26,13 +26,13 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="6">
-									回转窑工段主要设备（100KW以上）单位产品电耗数据表
+									烧成工序主要设备（100KW以上）单位产品电耗数据表
 								</th>
 							</tr>
 							<tr>
 								<th>设备名称</th>
 								<th>设备位号</th>
-								<th>单位</th>
+								<th>单位产品分布电耗</th>
 								<th>上个小时</th>
 								<th>昨日</th>
 								<th>本月</th>
@@ -253,7 +253,7 @@ export default {
 			tableData: [],
 			modelValue: true,
 			type: "hour_s",
-			title: "回转窑工段",
+			title: "烧成工序",
 			cate: "",
 			apiObj: this.$API.enm.mpoint.stat,
 			showClose: true,
@@ -548,7 +548,7 @@ export default {
 					res.forEach((item) => {
 						let index = that.mpoints.indexOf(item.mpoint_name);
 						let obj = [];
-						obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+						obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 						obj[1] = item.ep_monitored_number;
 						obj[2] = "KW·h/t";
 						obj[3] = item.elec_consume_unit;
@@ -587,7 +587,7 @@ export default {
 									item.elec_consume_unit;
 							} else {
 								let obj = [];
-								obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+								obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 								obj[1] = item.ep_monitored_number;
 								obj[2] = "KW·h/t";
 								obj[4] = item.elec_consume_unit;
@@ -614,7 +614,7 @@ export default {
 										item.elec_consume_unit;
 								} else {
 									let obj = [];
-									obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+									obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 									obj[1] = item.ep_monitored_number;
 									obj[2] = "KW·h/t";
 									obj[5] = item.elec_consume_unit;
diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue
index 21831f38..0f09a0b8 100644
--- a/src/views/enm_kiln/report.vue
+++ b/src/views/enm_kiln/report.vue
@@ -25,7 +25,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="10">回转窑工段生产报告</th>
+								<th colspan="10">烧成工序生产报告</th>
 							</tr>
 							<tr>
 								<th colspan="2">参数</th>
@@ -167,7 +167,7 @@
 				</div>
 			</div>
 
-			<sc-dialog v-model="chartShow" draggable title="回转窑工段">
+			<sc-dialog v-model="chartShow" draggable title="烧成工序">
 				<div class="searchHead" v-if="type == 'hours'">
 					<el-date-picker
 						v-model="query.start_time"
@@ -452,7 +452,7 @@ export default {
 			tableName: "生产报告",
 			modelValue: true,
 			type: "hour_s",
-			title: "回转窑工段",
+			title: "烧成工序",
 			cate: "",
 			apiObj: this.$API.enm.enstat,
 			showClose: true,
diff --git a/src/views/enm_kiln/teamAnalysis.vue b/src/views/enm_kiln/teamAnalysis.vue
index bd763997..e9dd22b0 100644
--- a/src/views/enm_kiln/teamAnalysis.vue
+++ b/src/views/enm_kiln/teamAnalysis.vue
@@ -38,7 +38,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="32">回转窑工段班组月度对比分析</th>
+								<th colspan="32">烧成工序班组月度对比分析</th>
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
diff --git a/src/views/enm_kilnbase/power.vue b/src/views/enm_kilnbase/power.vue
index 8264b55c..95d8c663 100644
--- a/src/views/enm_kilnbase/power.vue
+++ b/src/views/enm_kilnbase/power.vue
@@ -239,7 +239,7 @@ export default {
 			],
 			modelValue: true,
 			type: "hour_s",
-			title: "回转窑工段",
+			title: "烧成工序",
 			cate: "",
 			apiObj: this.$API.enm.mpoint.stat,
 			showClose: true,
diff --git a/src/views/enm_kilnbase/report.vue b/src/views/enm_kilnbase/report.vue
index 4d5df816..665fe208 100644
--- a/src/views/enm_kilnbase/report.vue
+++ b/src/views/enm_kilnbase/report.vue
@@ -24,7 +24,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="10">回转窑工段生产报告</th>
+								<th colspan="10">烧成工序生产报告</th>
 							</tr>
 							<tr>
 								<th colspan="2">参数</th>
@@ -160,7 +160,7 @@
 				</div>
 			</div>
 
-			<sc-dialog v-model="chartShow" draggable title="回转窑工段">
+			<sc-dialog v-model="chartShow" draggable title="烧成工序">
 				<div class="searchHead" v-if="type == 'hours'">
 					<el-date-picker
 						v-model="query.start_time"
@@ -411,7 +411,7 @@ export default {
 			tableName: "生产报告",
 			modelValue: true,
 			type: "hour_s",
-			title: "回转窑工段",
+			title: "烧成工序",
 			cate: "",
 			apiObj: this.$API.enm.enstat,
 			showClose: true,
diff --git a/src/views/enm_kilnbase/teamAnalysis.vue b/src/views/enm_kilnbase/teamAnalysis.vue
index c67a57a9..34b49c0f 100644
--- a/src/views/enm_kilnbase/teamAnalysis.vue
+++ b/src/views/enm_kilnbase/teamAnalysis.vue
@@ -37,7 +37,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="19">回转窑工段班组月度对比分析</th>
+								<th colspan="19">烧成工序班组月度对比分析</th>
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
diff --git a/src/views/enm_mill/power.vue b/src/views/enm_mill/power.vue
index 122425b8..528839c5 100644
--- a/src/views/enm_mill/power.vue
+++ b/src/views/enm_mill/power.vue
@@ -26,13 +26,13 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="6">
-									水泥磨工段主要设备（100KW以上）单位产品电耗数据表
+									水泥粉磨工序主要设备（100KW以上）单位产品电耗数据表
 								</th>
 							</tr>
 							<tr>
 								<th>设备名称</th>
 								<th>设备位号</th>
-								<th>单位</th>
+								<th>单位产品分布电耗</th>
 								<th>上个小时</th>
 								<th>昨日</th>
 								<th>本月</th>
@@ -251,7 +251,7 @@ export default {
 			tableData: [],
 			modelValue: true,
 			type: "hour_s",
-			title: "水泥磨工段",
+			title: "水泥粉磨工序",
 			cate: "",
 			apiObj: this.$API.enm.mpoint.stat,
 			showClose: true,
@@ -505,7 +505,7 @@ export default {
 					res.forEach((item) => {
 						let index = that.mpoints.indexOf(item.mpoint_name);
 						let obj = [];
-						obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
+						obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 						obj[1] = item.ep_monitored_number;
 						obj[2] = "KW·h/t";
 						obj[3] = item.elec_consume_unit;
@@ -542,7 +542,7 @@ export default {
 									item.elec_consume_unit;
 							} else {
 								let obj = [];
-								obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+								obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 								obj[1] = item.ep_monitored_number;
 								obj[2] = "KW·h/t";
 								obj[4] = item.elec_consume_unit;
@@ -569,7 +569,7 @@ export default {
 										item.elec_consume_unit;
 								} else {
 									let obj = [];
-									obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+									obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 									obj[1] = item.ep_monitored_number;
 									obj[2] = "KW·h/t";
 									obj[5] = item.elec_consume_unit;
diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue
index 772c18fb..91114846 100644
--- a/src/views/enm_mill/report.vue
+++ b/src/views/enm_mill/report.vue
@@ -25,7 +25,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="10">水泥磨工段生产报告</th>
+								<th colspan="10">水泥粉磨工序生产报告</th>
 							</tr>
 							<tr>
 								<th colspan="2">参数</th>
@@ -156,7 +156,7 @@
 				</div>
 			</div>
 
-			<sc-dialog v-model="chartShow" draggable title="水泥磨工段">
+			<sc-dialog v-model="chartShow" draggable title="水泥粉磨工序">
 				<div class="searchHead" v-if="type == 'hours'">
 					<el-date-picker
 						v-model="query.start_time"
@@ -414,7 +414,7 @@ export default {
 			tableName: "生产报告",
 			modelValue: true,
 			type: "hour_s",
-			title: "水泥磨工段",
+			title: "水泥粉磨工序",
 			cate: "",
 			apiObj: this.$API.enm.enstat,
 			showClose: true,
diff --git a/src/views/enm_mill/teamAnalysis.vue b/src/views/enm_mill/teamAnalysis.vue
index 5770d43c..d55bb0f7 100644
--- a/src/views/enm_mill/teamAnalysis.vue
+++ b/src/views/enm_mill/teamAnalysis.vue
@@ -38,7 +38,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="19">水泥磨工段班组月度对比分析</th>
+								<th colspan="19">水泥粉磨工序班组月度对比分析</th>
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
@@ -58,7 +58,7 @@
 								<th>比表面积（%）</th>
 								<th>SO3（%）</th>
 								<th>掺量（%）</th>
-								<th>循环风机1906（KW·h/t）</th>
+								<th>原料循环风机（KW·h/t）</th>
 								<th>系统风机（KW·h/t）</th>
 								<th>目标值（kW·h/t）</th>
 								<th>当期值（kW·h/t）</th>
@@ -215,8 +215,8 @@ export default {
 									: "/";
 							//设备
 							arr[9] =
-								item.循环风机_consume_unit != null
-									? item.循环风机_consume_unit
+								item.原料循环风机_consume_unit != null
+									? item.原料循环风机_consume_unit
 									: "/";
 							arr[10] =
 								item.系统风机_consume_unit != null
diff --git a/src/views/enm_mill/workshopAnalysis.vue b/src/views/enm_mill/workshopAnalysis.vue
index be6a9d1f..fce29913 100644
--- a/src/views/enm_mill/workshopAnalysis.vue
+++ b/src/views/enm_mill/workshopAnalysis.vue
@@ -52,7 +52,7 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="9">
-									水泥磨工段车间单位产品电耗月度分析表
+									水泥粉磨工序车间单位产品电耗月度分析表
 								</th>
 							</tr>
 							<tr>
@@ -102,7 +102,7 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="9">
-									水泥磨工段车间单位产品综合能耗月度分析表
+									水泥粉磨工序车间单位产品综合能耗月度分析表
 								</th>
 							</tr>
 							<tr>
diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue
index 3327f2a2..9f5e8a96 100644
--- a/src/views/enm_pack/report.vue
+++ b/src/views/enm_pack/report.vue
@@ -25,7 +25,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="9">水泥包装工段生产报告</th>
+								<th colspan="9">水泥包装工序生产报告</th>
 							</tr>
 							<tr>
 								<th colspan="2">参数</th>
@@ -121,7 +121,7 @@
 				</div>
 			</div>
 
-			<sc-dialog v-model="chartShow" draggable title="水泥包装工段">
+			<sc-dialog v-model="chartShow" draggable title="水泥包装工序">
 				<div class="searchHead" v-if="type == 'hours'">
 					<el-date-picker
 						v-model="query.start_time"
diff --git a/src/views/enm_pack/teamAnalysis.vue b/src/views/enm_pack/teamAnalysis.vue
index eb3cf18b..f39e8f0d 100644
--- a/src/views/enm_pack/teamAnalysis.vue
+++ b/src/views/enm_pack/teamAnalysis.vue
@@ -39,7 +39,7 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="11">
-									水泥包装工段班组月度对比分析
+									水泥包装工序班组月度对比分析
 								</th>
 							</tr>
 							<tr>
diff --git a/src/views/enm_pack/workshopAnalysis.vue b/src/views/enm_pack/workshopAnalysis.vue
index 1af8c85c..6024612a 100644
--- a/src/views/enm_pack/workshopAnalysis.vue
+++ b/src/views/enm_pack/workshopAnalysis.vue
@@ -39,7 +39,7 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="8">
-									水泥包装工段车间单位产品电耗月度分析表
+									水泥包装工序车间单位产品电耗月度分析表
 								</th>
 							</tr>
 							<tr>
diff --git a/src/views/enm_report/costing.vue b/src/views/enm_report/costing.vue
index 7e71874f..e57315b2 100644
--- a/src/views/enm_report/costing.vue
+++ b/src/views/enm_report/costing.vue
@@ -176,7 +176,7 @@ export default {
             let arr = [];
             params.page = 0;
             params.mgroup = that.query.mgroup;
-            params.mgroup_name = that.query.mgroup_name;
+            // params.mgroup_name = that.query.mgroup_name;
             if (that.query.type == 0) {//班
                 arr = that.query.day.split('-');
                 params.year_s = Number(arr[0]);
@@ -215,7 +215,17 @@ export default {
                         if (materialName === "入窑生料") {
                             materialName = "生料";
                         }
-                        arr.push(materialName)
+                        var unit = "（吨）"
+                        if (materialName == "动力电") {
+                            unit = "（度）"
+                        }
+                        else if (materialName == "包装袋"){
+                            unit = "（袋）"
+                        }
+                        else if (materialName == "压缩空气" || materialName == "蒸汽") {
+                            unit = "（m³）"
+                        }
+                        arr.push(materialName + unit)
                         arr.push('单价（元/吨）')
                         arr.push('总成本（元）')
                         arr.push('单位成本（元/吨）')
@@ -223,7 +233,7 @@ export default {
                     materials.forEach(item => {
                         if(item.material_name == "动力电"){ 
                             that.data2 =  that.data2 + 4
-                            arr.push(item.material_name)
+                            arr.push(item.material_name + '（度）')
                             arr.push('单价（元/度）')
                             arr.push('总成本（元）')
                             arr.push('单位成本（元/吨）')
@@ -232,7 +242,7 @@ export default {
                     materials.forEach(item => {
                        if(item.material_name == "工业水"){
                            that.data2 =  that.data2 + 4
-                           arr.push(item.material_name)
+                           arr.push(item.material_name + '（吨）')
                            arr.push('单价（元/吨）')
                            arr.push('总成本（元）')
                            arr.push('单位成本（元/吨）')
diff --git a/src/views/enm_rm/power.vue b/src/views/enm_rm/power.vue
index c70b6ac1..c2e3d5f8 100644
--- a/src/views/enm_rm/power.vue
+++ b/src/views/enm_rm/power.vue
@@ -26,13 +26,13 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="6">
-									原料磨工段主要设备（100KW以上）单位产品电耗数据表
+									生料工序主要设备（100KW以上）单位产品电耗数据表
 								</th>
 							</tr>
 							<tr>
 								<th>设备名称</th>
 								<th>设备位号</th>
-								<th>单位</th>
+								<th>单位产品分布电耗</th>
 								<th>上个小时</th>
 								<th>昨日</th>
 								<th>本月</th>
@@ -246,7 +246,7 @@ export default {
 			tableData: [],
 			modelValue: true,
 			type: "hour_s",
-			title: "原料磨工段",
+			title: "生料工序",
 			cate: "",
 			apiObj: this.$API.enm.mpoint.stat,
 			showClose: true,
@@ -482,7 +482,7 @@ export default {
 						}
 						let index = that.mpoints.indexOf(item.mpoint_name);
 						let obj = [];
-						obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+						obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 						obj[1] = item.ep_monitored_number;
 						obj[2] = "KW·h/t";
 						obj[3] = item.elec_consume_unit;
@@ -521,7 +521,7 @@ export default {
 									item.elec_consume_unit;
 							} else {
 								let obj = [];
-								obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+								obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 								obj[1] = item.ep_monitored_number;
 								obj[2] = "KW·h/t";
 								obj[4] = item.elec_consume_unit;
@@ -551,7 +551,7 @@ export default {
 										item.elec_consume_unit;
 								} else {
 									let obj = [];
-									obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+									obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 									obj[1] = item.ep_monitored_number;
 									obj[2] = "KW·h/t";
 									obj[5] = item.elec_consume_unit;
diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue
index 26f9cfc3..5190a5d0 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>
@@ -155,7 +155,7 @@
 				</div>
 			</div>
 
-			<sc-dialog v-model="chartShow" draggable title="原料磨工段">
+			<sc-dialog v-model="chartShow" draggable title="生料工序">
 				<div class="searchHead" v-if="type == 'hours'">
 					<el-date-picker
 						v-model="query.start_time"
@@ -414,7 +414,7 @@ export default {
 			tableName: "生产报告",
 			modelValue: true,
 			type: "hours",
-			title: "原料磨工段",
+			title: "生料工序",
 			cate: "",
 			apiObj: this.$API.enm.enstat,
 			showClose: true,
diff --git a/src/views/enm_rm/teamAnalysis.vue b/src/views/enm_rm/teamAnalysis.vue
index f2e0dbec..f2db03f7 100644
--- a/src/views/enm_rm/teamAnalysis.vue
+++ b/src/views/enm_rm/teamAnalysis.vue
@@ -38,7 +38,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="23">原料磨工段班组月度对比分析</th>
+								<th colspan="23">生料工序班组月度对比分析</th>
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
diff --git a/src/views/enm_rm/workshopAnalysis.vue b/src/views/enm_rm/workshopAnalysis.vue
index 778a5aca..a7899d94 100644
--- a/src/views/enm_rm/workshopAnalysis.vue
+++ b/src/views/enm_rm/workshopAnalysis.vue
@@ -39,7 +39,7 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="8">
-									原料磨工段车间单位产品电耗月度分析表
+									生料工序车间单位产品电耗月度分析表
 								</th>
 							</tr>
 							<tr>
diff --git a/src/views/enm_rmbase/power.vue b/src/views/enm_rmbase/power.vue
index 5c07a1a5..aeb0ef78 100644
--- a/src/views/enm_rmbase/power.vue
+++ b/src/views/enm_rmbase/power.vue
@@ -230,7 +230,7 @@ export default {
 			],
 			modelValue: true,
 			type: "hour_s",
-			title: "原料磨工段",
+			title: "生料工序",
 			cate: "",
 			apiObj: this.$API.enm.mpoint.stat,
 			showClose: true,
diff --git a/src/views/enm_rmbase/report.vue b/src/views/enm_rmbase/report.vue
index d4a588fa..da76b007 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>
@@ -153,7 +153,7 @@
 				</div>
 			</div>
 
-			<sc-dialog v-model="chartShow" draggable title="原料磨工段">
+			<sc-dialog v-model="chartShow" draggable title="生料工序">
 				<div class="searchHead" v-if="type == 'hours'">
 					<el-date-picker
 						v-model="query.start_time"
@@ -404,7 +404,7 @@ export default {
 			tableName: "生产报告",
 			modelValue: true,
 			type: "hours",
-			title: "原料磨工段",
+			title: "生料工序",
 			cate: "",
 			apiObj: this.$API.enm.enstat,
 			showClose: true,
diff --git a/src/views/enm_rmbase/teamAnalysis.vue b/src/views/enm_rmbase/teamAnalysis.vue
index 20e9069a..09f9f330 100644
--- a/src/views/enm_rmbase/teamAnalysis.vue
+++ b/src/views/enm_rmbase/teamAnalysis.vue
@@ -37,7 +37,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="12">原料磨工段班组月度对比分析</th>
+								<th colspan="12">生料工序班组月度对比分析</th>
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
diff --git a/src/views/enm_rmbase/workshopAnalysis.vue b/src/views/enm_rmbase/workshopAnalysis.vue
index 696cb432..7f79a196 100644
--- a/src/views/enm_rmbase/workshopAnalysis.vue
+++ b/src/views/enm_rmbase/workshopAnalysis.vue
@@ -38,7 +38,7 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="8">
-									原料磨工段车间单位产品电耗月度分析表
+									生料工序车间单位产品电耗月度分析表
 								</th>
 							</tr>
 							<tr>
diff --git a/src/views/enm_slag/power.vue b/src/views/enm_slag/power.vue
index 256342ab..d742333c 100644
--- a/src/views/enm_slag/power.vue
+++ b/src/views/enm_slag/power.vue
@@ -26,13 +26,13 @@
 						<thead class="myTableHead">
 							<tr>
 								<th colspan="5">
-									电石渣工段主要设备（100KW以上）单位产品电耗数据表
+									电石渣工序主要设备（100KW以上）单位产品电耗数据表
 								</th>
 							</tr>
 							<tr>
 								<th>设备名称</th>
 								<th>设备位号</th>
-								<th>单位</th>
+								<th>单位产品分布电耗</th>
 								<th>昨日</th>
 								<th>本月</th>
 							</tr>
@@ -205,7 +205,7 @@ export default {
 			tableData: [],
 			modelValue: true,
 			type: "day_s",
-			title: "电石渣工段",
+			title: "电石渣工序",
 			cate: "",
 			apiObj: this.$API.enm.mpoint.stat,
 			showClose: true,
@@ -344,7 +344,7 @@ export default {
 						that.tableDatas[index_d][3] = item.elec_consume_unit;
 					} else {
 						let obj = [];
-						obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+						obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 						obj[1] = item.ep_monitored_number;
 						obj[2] = "KW·h/t";
 						obj[3] = item.elec_consume_unit;
@@ -371,7 +371,7 @@ export default {
 								item.elec_consume_unit;
 						} else {
 							let obj = [];
-							obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;;
+							obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 							obj[1] = item.ep_monitored_number;
 							obj[2] = "KW·h/t";
 							obj[4] = item.elec_consume_unit;
diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue
index d37702c6..16dbca41 100644
--- a/src/views/enm_slag/report.vue
+++ b/src/views/enm_slag/report.vue
@@ -25,7 +25,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="9">电石渣工段生产报告</th>
+								<th colspan="9">电石渣工序生产报告</th>
 							</tr>
 							<tr>
 								<th colspan="2">参数</th>
@@ -127,7 +127,7 @@
 					</div>
 				</div>
 			</div>
-			<sc-dialog v-model="chartShow" draggable title="电石渣工段">
+			<sc-dialog v-model="chartShow" draggable title="电石渣工序">
 				<div class="searchHead" v-if="type == 'hours'">
 					<el-date-picker
 						v-model="query.start_time"
@@ -396,7 +396,7 @@ export default {
 				mgroup: "3346491835287007232",
 			},
 			tableDatas: [
-				["产量", "总产量（t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["电石干粉产量", "总产量（t）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["能耗", "单位产品分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["能耗", "总电耗（KW·h）", 0, 0, 0, "/", "/", "/", "/", "/"],
 				["成本", "电石渣成本（元/吨）", 0, 0, 0, 0, 0, 0, 0, 0],
@@ -408,7 +408,7 @@ export default {
 			tableName: "生产报告",
 			modelValue: true,
 			type: "hour_s",
-			title: "电石渣工段",
+			title: "电石渣工序",
 			showClose: true,
 			echartType: "line",
 			asynDialog: false,
diff --git a/src/views/enm_slag/teamAnalysis.vue b/src/views/enm_slag/teamAnalysis.vue
index f25bb6fa..e7cf040f 100644
--- a/src/views/enm_slag/teamAnalysis.vue
+++ b/src/views/enm_slag/teamAnalysis.vue
@@ -38,7 +38,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="12">电石渣工段班组月度对比分析</th>
+								<th colspan="12">电石渣工序班组月度对比分析</th>
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>