From 5f15f087f18a6d5c84d0f75ee536391ee36a5e57 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Thu, 27 Feb 2025 14:29:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20enm/=E4=BF=AE=E6=94=B9=E6=A0=A1?=
 =?UTF-8?q?=E6=AD=A3=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_enm.vue | 2 +-
 src/views/fac_cal/mpointstat.vue  | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 21bfcc27..32b2e41c 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -1299,7 +1299,7 @@ export default {
 				};
 			}
 			// 第一个API查询 煤磨总产量 月数据
-			let query1 = generateQuery("3626253029718056960");
+			let query1 = generateQuery("3626253231757619200");
 			this.$API.enm.enstat.req(query1).then((response) => {
 				response.forEach((item) => {
 					if (item.qua_data.length > 0) {
diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue
index 7d69a3c7..94cb6b3d 100644
--- a/src/views/fac_cal/mpointstat.vue
+++ b/src/views/fac_cal/mpointstat.vue
@@ -107,7 +107,6 @@
 							<el-button
 								link
 								size="small"
-								v-if="scope.row.type == 'year_s' || scope.row.type == 'month_s' || scope.row.type == 'day_s'|| scope.row.type == 'month'|| scope.row.type == 'day'"
 								@click="handle_edit(scope.row)"
 								type="primary"
 								>校正</el-button
@@ -239,7 +238,6 @@ export default {
 				{ label: "班天", value: "day_s" },
 				{ label: "班月", value: "month_s" },
 				{ label: "班时", value: "hour_s"},
-				{ label: "小时", value: "hour"},
                 { label: "天", value: "day" },
                 { label: "月", value: "month"},
 			],
@@ -261,9 +259,9 @@ export default {
 		}
 		let option = { ...that.chartOption };
 		// 获取 x 轴的数据，如果query.type为小时，则显示小时，如果为天则显示天，如果为月则显示月
-		if (that.query.type == "hour") {
-			option.title.text = "小时统计";
-			option.xAxis.data = tableData.reverse().map((item) => item.year + "-" + item.month + "-" + item.day + " " + item.hour);
+		if (that.query.type == "hour_s") {
+			option.title.text = "班时统计";
+			option.xAxis.data = tableData.reverse().map((item) => item.year_s + "-" + item.month + "-" + item.day + " " + item.hour);
 		}else if (that.query.type == "day") {
 			option.title.text = "天统计";
 			option.xAxis.data = tableData.reverse().map((item, index) => item.year + "-" + item.month + "-" + item.day);