From 79debc42423fde8d37b5c05b778b1559b5766da5 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 6 Dec 2024 19:22:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A1=E7=AE=97=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fac_cal/enstat.vue     | 27 +++++++++++++++-----------
 src/views/fac_cal/mpointstat.vue | 33 ++++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/views/fac_cal/enstat.vue b/src/views/fac_cal/enstat.vue
index 5557b233..ed0b1a8c 100644
--- a/src/views/fac_cal/enstat.vue
+++ b/src/views/fac_cal/enstat.vue
@@ -50,13 +50,18 @@
 					highlightCurrentRow
 				>
                 <el-table-column label="所属集合" prop="mgroup_name" width="120"></el-table-column>
-                <el-table-column label="类型" prop="type" width="75"> </el-table-column>
-                <el-table-column label="年" prop="year" width="60"> </el-table-column>
-                <el-table-column label="班年" prop="year_s" width="60"> </el-table-column>
-                <el-table-column label="月" prop="month" width="50"> </el-table-column>
-                <el-table-column label="班月" prop="month_s" width="50"> </el-table-column>
-                <el-table-column label="日" prop="day" width="50"> </el-table-column>
-                <el-table-column label="班日" prop="day_s" width="50"> </el-table-column>
+                <el-table-column label="类型" prop="type" width="80"> </el-table-column>
+                <el-table-column label="班算" width="100"> 
+                    <template #default="scope">
+                        {{ scope.row.year_s }}-{{ scope.row.month_s }}-{{ scope.row.day_s }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="实算" width="100"> 
+                    <template #default="scope">
+                        {{ scope.row.year }}-{{ scope.row.month }}-{{ scope.row.day }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="小时" prop="hour" width="50"></el-table-column>
                 <el-table-column label="班组" prop="team_name" width="60"> </el-table-column>
                 <el-table-column label="总产量" prop="total_production" width="90" show-overflow-tooltip></el-table-column>
                 <el-table-column label="电消耗" prop="elec_consume" width="90" show-overflow-tooltip></el-table-column>
@@ -85,17 +90,17 @@ export default {
             params: {
             },
             query: {
-                ordering: "-update_time",
                 type: "day_s",
+                ordering: "-create_time",
                 start_time: null,
                 end_time: null
             },
             options: [
+                { label: "班时", value: "hour_s"},
 				{ label: "班天", value: "day_s" },
 				{ label: "班月", value: "month_s" },
-				{ label: "小时", value: "hour"},
-                { label: "天", value: "day" },
-                { label: "月", value: "month"},
+				{ label: "班组月", value: "month_st" },
+                { label: "班年", value: "year_s" },
 			],
             timeRange: []
         }
diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue
index 23bfb168..8dc2c28e 100644
--- a/src/views/fac_cal/mpointstat.vue
+++ b/src/views/fac_cal/mpointstat.vue
@@ -14,6 +14,16 @@
 					<el-table-column label="别名" prop="nickname"></el-table-column>
 					<el-table-column label="计量物料" prop="material_name"></el-table-column>
 				</xtSelect>
+				<xtSelect
+					:apiObj="apiObjM2"
+					:params="paramsM2"
+					v-model="query.mgroup"
+					style="width: 300px; padding-left: 2px;"
+					@change="handleQuery"
+					placeholder="选择工段"
+				>
+					<el-table-column label="名称" prop="name"></el-table-column>
+				</xtSelect>
 				<el-select
 					v-model="query.type"
 					placeholder="类型"
@@ -61,13 +71,17 @@
 					<el-table-column label="所属集合" prop="mgroup_name">
 					</el-table-column>
 					<el-table-column label="类型" prop="type" width="75"> </el-table-column>
-					<el-table-column label="年" prop="year" width="60"> </el-table-column>
-					<el-table-column label="班年" prop="year_s" width="60"> </el-table-column>
-					<el-table-column label="月" prop="month" width="50"> </el-table-column>
-					<el-table-column label="班月" prop="month_s" width="50"> </el-table-column>
-					<el-table-column label="日" prop="day" width="50"> </el-table-column>
-					<el-table-column label="班日" prop="day_s" width="50"> </el-table-column>
-					<el-table-column label="时" prop="hour" width="50"> </el-table-column>
+					<el-table-column label="班算" width="100"> 
+						<template #default="scope">
+							{{ scope.row.year_s }}-{{ scope.row.month_s }}-{{ scope.row.day_s }}
+						</template>
+					</el-table-column>
+					<el-table-column label="实算" width="100"> 
+						<template #default="scope">
+							{{ scope.row.year }}-{{ scope.row.month }}-{{ scope.row.day }}
+						</template>
+					</el-table-column>
+					<el-table-column label="小时" prop="hour" width="50"> </el-table-column>
 					<el-table-column label="当前值" prop="val"  min-width="100"></el-table-column>
 					<el-table-column
 						label="校正值"
@@ -162,6 +176,8 @@ export default {
 		return {
 			apiObjM: this.$API.enm.mpoint.list,
 			paramsM: {material__isnull: 0},
+			apiObjM2: this.$API.mtm.mgroup.list,
+			paramsM2: {page: 0},
 			apiObj: this.$API.enm.mpoint.stat,
             params: {
 				type: "day_s",
@@ -170,7 +186,7 @@ export default {
                 mpoint: null,
                 type: "day_s",
                 start_time: null,
-                end_time: null
+                end_time: null,
             },
 			chartOption: {
 				title: {
@@ -218,6 +234,7 @@ export default {
 			options: [
 				{ label: "班天", value: "day_s" },
 				{ label: "班月", value: "month_s" },
+				{ label: "班时", value: "hour_s"},
 				{ label: "小时", value: "hour"},
                 { label: "天", value: "day" },
                 { label: "月", value: "month"},