Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

2024-12-09 11:07:30 +08:00 · 2024-12-09 11:07:30 +08:00 · d30376cd17
parent 5b3fa16bec 5b1f9db6d8
commit d30376cd17
6 changed files with 71 additions and 35 deletions
--- a/.env.development
+++ b/.env.development
@ -6,7 +6,7 @@ NODE_ENV = development
 # VUE_APP_TITLE = '托克逊能源管理平台'
 VUE_APP_TITLE = '中建材光子科技有限公司'
 # VUE_APP_TITLE = '超低排放系统'
-VUE_APP_PJ = 'gx'
+VUE_APP_PJ = ''

 # 接口地址
 #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
@ -17,7 +17,7 @@ VUE_APP_PJ = 'gx'

 #测试环境
 #  VUE_APP_API_BASEURL = http://10.50.211.228:2250/api
-# VUE_APP_API_BASEURL = http://127.0.0.1:2226/api
+# VUE_APP_API_BASEURL = http://127.0.0.1:226/api

 #  VUE_APP_BASEURL = http://10.50.211.228:2250/

--- a/src/views/em/mpoint.vue
+++ b/src/views/em/mpoint.vue
@ -23,6 +23,16 @@
 				>
 			</div>
 			<div class="right-panel">
+				<xtSelect
+					:apiObj="apiObjM"
+					:params="paramsM"
+					v-model="query.material"
+					style="width: 180px"
+					@change="handleQuery"
+					placeholder="计量物料"
+				>
+					<el-table-column label="名称" prop="name"></el-table-column>
+				</xtSelect>
 				<el-select
 					v-model="query.enabled"
 					placeholder="是否启用"
@ -37,6 +47,20 @@
 						:label="e.text"
 					></el-option>
 				</el-select>
+				<el-select
+					v-model="query.is_rep_mgroup"
+					placeholder="是否工段统计"
+					@change="handleQuery"
+					clearable
+					style="width: 100px"
+				>
+					<el-option
+						v-for="e in boolEnum.values"
+						:key="e.key"
+						:value="e.key"
+						:label="e.text"
+					></el-option>
+				</el-select>
 				<el-select
 					v-model="query.type"
 					placeholder="测点类型"
@ -335,6 +359,8 @@ export default {
 				save: false,
 				permission: false,
 			},
+			apiObjM: this.$API.mtm.material.list,
+			paramsM: {},
 			apiObj: this.$API.enm.mpoint.list,
 			apiObjMplog: null,
 			params: {},
--- a/src/views/enm_rm/logDetail.vue
+++ b/src/views/enm_rm/logDetail.vue
@ -642,13 +642,8 @@ export default {
 				current_sflog: "",
 				current_note: "",
 				title: "",
-				start_time: "",
-				end_time: "",
-				cate: "",
-				reason: "",
-				measure: "",
-				handler: "",
-				mgroup: "",
+				start_time: null,
+				end_time: null,
 				is_shutdown: false,
 			},
 			query: {
--- a/src/views/enm_rm/stlog_form.vue
+++ b/src/views/enm_rm/stlog_form.vue
@ -152,13 +152,6 @@ export default {
 				current_sflog: "",
 				current_note: "",
 				title: "",
-				start_time: "",
-				end_time: "",
-				cate: "",
-				reason: "",
-				measure: "",
-				handler: "",
-				mgroup: "",
 				is_shutdown: false,
 			},
 			rules: {
--- 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: []
        }
--- 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"},