diff --git a/src/views/enm_coal/power.vue b/src/views/enm_coal/power.vue
index efa3363d..8e72d82f 100644
--- a/src/views/enm_coal/power.vue
+++ b/src/views/enm_coal/power.vue
@@ -33,7 +33,7 @@
 								<th>设备名称</th>
 								<th>设备位号</th>
 								<th>单位产品分布电耗</th>
-								<th>上个小时</th>
+								<th>本日</th>
 								<th>昨日</th>
 								<th>本月</th>
 							</tr>
@@ -412,11 +412,11 @@ export default {
 			let days_h = hourDate.getDate();
 			let hours_h = hourDate.getHours();
 			let obj = {};
-			obj.type = "hour_s";
-			obj.year = year_h;
-			obj.month = month_h;
-			obj.day = days_h;
-			obj.hour = hours_h;
+			obj.type = "day_s";
+			obj.year_s = year_h;
+			obj.month_s = month_h;
+			obj.day_s = days_h;
+			// obj.hour = hours_h; //上个小时改为本日
 			obj.mgroup__name = "煤磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__need_display = 1;
diff --git a/src/views/enm_kiln/power.vue b/src/views/enm_kiln/power.vue
index 00af3c62..9c94cfbc 100644
--- a/src/views/enm_kiln/power.vue
+++ b/src/views/enm_kiln/power.vue
@@ -33,7 +33,7 @@
 								<th>设备名称</th>
 								<th>设备位号</th>
 								<th>单位产品分布电耗</th>
-								<th>上个小时</th>
+								<th>本日</th>
 								<th>昨日</th>
 								<th>本月</th>
 							</tr>
@@ -532,11 +532,11 @@ export default {
 			let days_h = hourDate.getDate();
 			let hours_h = hourDate.getHours();
 			let obj = {};
-			obj.type = "hour_s";
-			obj.year = year_h;
-			obj.month = month_h;
-			obj.day = days_h;
-			obj.hour = hours_h;
+			obj.type = "day_s";
+			obj.year_s = year_h;
+			obj.month_s = month_h;
+			obj.day_s = days_h;
+			// obj.hour = hours_h; 上个小时改为本日
 			obj.mgroup__name = "回转窑";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__need_display = 1;
diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue
index 2de29ea5..6a7e8dcd 100644
--- a/src/views/enm_kiln/report.vue
+++ b/src/views/enm_kiln/report.vue
@@ -325,14 +325,16 @@ let legend = {
 		}
 	],
 	top: "2%",
+	width: "400px",
 	data: [
 		"回转窑总产量",
-		"回转窑台时产量",
+		"台时产量",
 		"回转窑运转率",
 		"熟料分布电耗",
 		"熟料标煤耗",
 		"熟料单位成本",
 	],
+	
 };
 let yAxis = [
 	{
@@ -353,7 +355,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "回转窑台时产量 (t/h)",
+		name: "台时产量 (t/h)",
 		position: "left",
 		alignTicks: true,
 		nameRotate: 50,
@@ -403,7 +405,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "标煤耗(kgce/t)",
+		name: "熟料标煤耗(kgce/t)",
 		position: "right",
 		alignTicks: true,
 		nameRotate: 50,
@@ -491,7 +493,7 @@ export default {
 				tooltip: tooltip,
 				grid: grid,
 				toolbox: toolbox,
-				legend:  Object.assign(legend, {data: ["回转窑总产量", "分布电耗", "熟料标煤耗", "熟料单位成本"]}),
+				legend:  Object.assign(legend, {data: ["回转窑总产量", "台时产量","回转窑运转率", "熟料分布电耗", "熟料标煤耗", "熟料单位成本"]}),
 				xAxis: {
 					axisTick: {
 						show: true,
@@ -631,7 +633,7 @@ export default {
 						data: [],
 					},
 					{
-						name: "回转窑台时产量",
+						name: "台时产量",
 						type: "bar",
 						yAxisIndex: 1,
 						data: [],
diff --git a/src/views/enm_mill/power.vue b/src/views/enm_mill/power.vue
index 743f6bc6..8ad247bc 100644
--- a/src/views/enm_mill/power.vue
+++ b/src/views/enm_mill/power.vue
@@ -33,7 +33,7 @@
 								<th>设备名称</th>
 								<th>设备位号</th>
 								<th>单位产品分布电耗</th>
-								<th>上个小时</th>
+								<th>本日</th>
 								<th>昨日</th>
 								<th>本月</th>
 							</tr>
@@ -489,11 +489,11 @@ export default {
 			let days_h = hourDate.getDate();
 			let hours_h = hourDate.getHours();
 			let obj = {};
-			obj.type = "hour_s";
-			obj.year = year_h;
-			obj.month = month_h;
-			obj.day = days_h;
-			obj.hour = hours_h;
+			obj.type = "day_s";
+			obj.year_s = year_h;
+			obj.month_s = month_h;
+			obj.day_s = days_h;
+			// obj.hour = hours_h; 上个小时改为本日
 			obj.mgroup__name = "水泥磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__need_display = 1;
diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue
index 88705a59..f770e6b3 100644
--- a/src/views/enm_mill/report.vue
+++ b/src/views/enm_mill/report.vue
@@ -431,7 +431,7 @@ export default {
 				tooltip: tooltip,
 				grid: grid,
 				toolbox: toolbox,
-				legend:  Object.assign(legend, {data: ["水泥磨总产量", "分布电耗", "水泥单位成本"]}),
+				legend:  Object.assign(legend, {data: ["水泥磨总产量", "分布电耗", "水泥单位成本","水泥磨台时产量","水泥磨运转率"]}),
 				xAxis: {
 					axisTick: {
 						show: true,
diff --git a/src/views/enm_monthSet/goalSetting.vue b/src/views/enm_monthSet/goalSetting.vue
index addfa457..25a4b7bf 100644
--- a/src/views/enm_monthSet/goalSetting.vue
+++ b/src/views/enm_monthSet/goalSetting.vue
@@ -42,14 +42,14 @@
 					@click="handleQuery"
 				></el-button>
 			</div>
-			<!-- <div class="right-panel">
+			<div class="right-panel">
 				<el-button
 					type="primary"
 					icon="el-icon-plus"
 					@click="roleAdd"
 					v-auth="'goal.create'"
 				></el-button>
-			</div> -->
+			</div>
 		</el-header>
 		<el-main class="nopadding">
 			<scTable
diff --git a/src/views/enm_rm/power.vue b/src/views/enm_rm/power.vue
index 7eadcba4..12d9c727 100644
--- a/src/views/enm_rm/power.vue
+++ b/src/views/enm_rm/power.vue
@@ -33,7 +33,7 @@
 								<th>设备名称</th>
 								<th>设备位号</th>
 								<th>单位产品分布电耗</th>
-								<th>上个小时</th>
+								<th>本日</th>
 								<th>昨日</th>
 								<th>本月</th>
 							</tr>
@@ -463,11 +463,11 @@ export default {
 			let days_h = hourDate.getDate();
 			let hours_h = hourDate.getHours();
 			let obj = {};
-			obj.type = "hour_s";
-			obj.year = year_h;
-			obj.month = month_h;
-			obj.day = days_h;
-			obj.hour = hours_h;
+			obj.type = "day_s";
+			obj.year_s = year_h;
+			obj.month_s = month_h;
+			obj.day_s = days_h;  // 上个小时要求改为本日
+			// obj.hour = hours_h;
 			obj.mgroup__name = "原料磨";
 			obj.mpoint__material__code__in = "elec,elec_0";
 			// obj.mpoint__need_display = 1;
@@ -477,7 +477,6 @@ export default {
 				.req(obj)
 				.then((res) => {
 					that.tableData = res;
-					console.log("getTableHourData", res);
 					res.forEach((item) => {
 						if (item.mpoint_name === "原料车间合计") {
 							return;
diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue
index 19dd6a86..38114d53 100644
--- a/src/views/enm_slag/report.vue
+++ b/src/views/enm_slag/report.vue
@@ -422,10 +422,10 @@ export default {
 			tableDatas: [
 				["产量", "电石渣干粉总产量（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, "/", "/", "/", "/", "/"],
+				["能耗", "电石渣工段总电量（kW·h）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["成本", "电石渣干粉成本（元/吨）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["电石渣", "湿电石渣消耗", 0, 0, 0, "/", "/", "/", "/", "/"],
-				["电石渣", "湿电石渣进厂", 0, 0, 0, "/", "/", "/", "/", "/"],
+				["电石渣", "湿电石渣消耗", 0, 0, 0, 0, 0, 0, 0, 0],
+				["电石渣", "湿电石渣进厂", 0, 0, 0, 0, 0, 0, 0, 0],
 			],
 			cate: "",
 			apiObj: this.$API.enm.enstat,