diff --git a/src/config/route.js b/src/config/route.js
index beaf7ed6..d6be9cf6 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -2815,6 +2815,26 @@ const routes = [
 						},
 						component: "fac_cal/mpointstat",
 					},
+					{
+						path: "/fac_cal/enstat",
+						meta: {
+							title: "工段计算",
+							// icon: "el-icon-postcard",
+							type: "menu",
+							perms: ["mpointstat"],
+						},
+						component: "fac_cal/enstat",
+					},
+					{
+						path: "/fac_cal/mpointstat_group",
+						meta: {
+							title: "计算聚合",
+							// icon: "el-icon-postcard",
+							type: "menu",
+							perms: ["mpointstat"],
+						},
+						component: "fac_cal/mpointstat_group",
+					},
 					{
 						name: "formula",
 						path: "/enm_base/formula",
diff --git a/src/views/fac_cal/enstat.vue b/src/views/fac_cal/enstat.vue
new file mode 100644
index 00000000..7644dc46
--- /dev/null
+++ b/src/views/fac_cal/enstat.vue
@@ -0,0 +1,126 @@
+<template>
+    <el-container>
+        <el-header>
+            <div class="left-panel">
+            <xtSelect
+					:apiObj="apiObjM"
+					:params="paramsM"
+					v-model="query.mgroup"
+					style="width: 500px"
+					@change="handleQuery"
+					placeholder="选择工段"
+				>
+					<el-table-column label="名称" prop="name"></el-table-column>
+				</xtSelect>
+				<el-select
+					v-model="query.type"
+					placeholder="类型"
+					style="margin: 0 6px; width: 160px"
+					@change="handleQuery"
+				>
+					<el-option
+						v-for="item in options"
+						:key="item.value"
+						:label="item.label"
+						:value="item.value"
+					></el-option>
+				</el-select>
+                <el-date-picker v-model="timeRange" type="datetimerange" 
+					value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
+					start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery"
+					style="width: 100%" 
+                    format="YYYY-MM-DD HH"
+                    popper-class="tpc"
+                    />
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					style="margin-left: 6px"
+					@click="handleQuery"
+				></el-button>
+			</div>
+        </el-header>
+        <el-main class="nopadding">
+            <scTable
+					ref="table"
+					:apiObj="apiObj"
+					row-key="id"
+					stripe
+					:params="params"
+					:query="query"
+					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="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>
+                <el-table-column label="水消耗" prop="water_consume" width="90" show-overflow-tooltip></el-table-column>
+                <el-table-column label="煤粉消耗" prop="pcoal_consume" width="90" show-overflow-tooltip></el-table-column>
+                <el-table-column label="压缩空气" prop="cair_consume" width="90" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单位产品分布电耗" prop="elec_consume_unit" width="130" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单位产品综合电耗" prop="celec_consume_unit" width="130" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单位产品标煤耗" prop="coal_consume_unit" width="110" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单位产品能耗" prop="en_consume_unit" width="110" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单位产品综合能耗" prop="cen_consume_unit" width="130" show-overflow-tooltip></el-table-column>
+                <el-table-column label="台时产量" prop="production_hour" width="90" show-overflow-tooltip></el-table-column>
+                <el-table-column label="运转时长" prop="run_sec" width="90" show-overflow-tooltip></el-table-column>
+            </scTable>
+        </el-main>
+    </el-container>
+</template>
+<script>
+export default {
+    name: 'enstat',
+    data() {
+        return {
+            apiObjM: this.$API.mtm.mgroup.list,
+			paramsM: {page: 0},
+            apiObj: this.$API.enm.enstat,
+            params: {
+            },
+            query: {
+                ordering: "-update_time",
+                type: "day_s",
+                start_time: null,
+                end_time: null
+            },
+            options: [
+				{ label: "班天", value: "day_s" },
+				{ label: "班月", value: "month_s" },
+				{ label: "小时", value: "hour"},
+                { label: "天", value: "day" },
+                { label: "月", value: "month"},
+			],
+            timeRange: []
+        }
+    },
+    methods: {
+        handleQuery() {
+            if (this.timeRange) {
+                this.query.start_time = this.timeRange[0]
+                this.query.end_time = this.timeRange[1]
+            } else {
+                this.query.start_time = null
+                this.query.end_time = null
+            }
+			this.$refs.table.queryData(this.query);
+		},
+    }
+}
+
+</script>
+<style>
+.tpc .el-time-spinner__wrapper {
+  width:100% !important;
+}
+.tpc .el-scrollbar:nth-of-type(2) {
+  display: none !important;
+}
+</style>
diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue
index a3210527..076efdce 100644
--- a/src/views/fac_cal/mpointstat.vue
+++ b/src/views/fac_cal/mpointstat.vue
@@ -30,7 +30,9 @@
                 <el-date-picker v-model="timeRange" type="datetimerange" 
 					value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
 					start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery"
-					style="width: 100%" />
+					style="width: 100%" 
+					format="YYYY-MM-DD HH"
+                    popper-class="tpc"/>
 				<el-button
 					type="primary"
 					icon="el-icon-search"
@@ -214,8 +216,8 @@ export default {
 				series: [],
 			},
 			options: [
-				{ label: "天校正", value: "day_s" },
-				{ label: "月校正", value: "month_s" },
+				{ label: "班天", value: "day_s" },
+				{ label: "班月", value: "month_s" },
 				{ label: "小时", value: "hour"},
                 { label: "天", value: "day" },
                 { label: "月", value: "month"},
@@ -313,3 +315,12 @@ export default {
 	margin-left: 5px;
 }
 </style>
+
+<style>
+.tpc .el-time-spinner__wrapper {
+  width:100% !important;
+}
+.tpc .el-scrollbar:nth-of-type(2) {
+  display: none !important;
+}
+</style>
diff --git a/src/views/fac_cal/mpointstat_group.vue b/src/views/fac_cal/mpointstat_group.vue
new file mode 100644
index 00000000..4972d636
--- /dev/null
+++ b/src/views/fac_cal/mpointstat_group.vue
@@ -0,0 +1,12 @@
+<template>
+    <el-container>
+        <el-main class="nopadding">
+            <el-card title="">
+
+            </el-card>
+        </el-main>
+    </el-container>
+
+</template>
+<script>
+</script>
\ No newline at end of file