zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 计算中心页面调整

This commit is contained in:
caoqianming 2024-12-06 19:22:19 +08:00
parent 9292cfe61d
commit 79debc4242
2 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/views/fac_cal/enstat.vue
View File

@ -50,13 +50,18 @@
highlightCurrentRow highlightCurrentRow
> >
<el-table-column label="所属集合" prop="mgroup_name" width="120"></el-table-column> <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="type" width="80"> </el-table-column>
<el-table-column label="年" prop="year" width="60"> </el-table-column> <el-table-column label="班算" width="100">
<el-table-column label="班年" prop="year_s" width="60"> </el-table-column> <template #default="scope">
<el-table-column label="月" prop="month" width="50"> </el-table-column> {{ scope.row.year_s }}-{{ scope.row.month_s }}-{{ scope.row.day_s }}
<el-table-column label="班月" prop="month_s" width="50"> </el-table-column> </template>
<el-table-column label="日" prop="day" width="50"> </el-table-column> </el-table-column>
<el-table-column label="班日" prop="day_s" width="50"> </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="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="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="elec_consume" width="90" show-overflow-tooltip></el-table-column>
@ -85,17 +90,17 @@ export default {
params: { params: {
}, },
query: { query: {
ordering: "-update_time",
type: "day_s", type: "day_s",
ordering: "-create_time",
start_time: null, start_time: null,
end_time: null end_time: null
}, },
options: [ options: [
{ label: "班时", value: "hour_s"},
{ label: "班天", value: "day_s" }, { label: "班天", value: "day_s" },
{ label: "班月", value: "month_s" }, { label: "班月", value: "month_s" },
{ label: "小时", value: "hour"}, { label: "班组月", value: "month_st" },
{ label: "天", value: "day" }, { label: "班年", value: "year_s" },
{ label: "月", value: "month"},
], ],
timeRange: [] timeRange: []
} }

33
src/views/fac_cal/mpointstat.vue
View File

@ -14,6 +14,16 @@
<el-table-column label="别名" prop="nickname"></el-table-column> <el-table-column label="别名" prop="nickname"></el-table-column>
<el-table-column label="计量物料" prop="material_name"></el-table-column> <el-table-column label="计量物料" prop="material_name"></el-table-column>
</xtSelect> </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 <el-select
v-model="query.type" v-model="query.type"
placeholder="类型" placeholder="类型"
@ -61,13 +71,17 @@
<el-table-column label="所属集合" prop="mgroup_name"> <el-table-column label="所属集合" prop="mgroup_name">
</el-table-column> </el-table-column>
<el-table-column label="类型" prop="type" width="75"> </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="班算" width="100">
<el-table-column label="班年" prop="year_s" width="60"> </el-table-column> <template #default="scope">
<el-table-column label="月" prop="month" width="50"> </el-table-column> {{ scope.row.year_s }}-{{ scope.row.month_s }}-{{ scope.row.day_s }}
<el-table-column label="班月" prop="month_s" width="50"> </el-table-column> </template>
<el-table-column label="日" prop="day" width="50"> </el-table-column> </el-table-column>
<el-table-column label="班日" prop="day_s" width="50"> </el-table-column> <el-table-column label="实算" width="100">
<el-table-column label="时" prop="hour" width="50"> </el-table-column> <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="当前值" prop="val" min-width="100"></el-table-column>
<el-table-column <el-table-column
label="校正值" label="校正值"
@ -162,6 +176,8 @@ export default {
return { return {
apiObjM: this.$API.enm.mpoint.list, apiObjM: this.$API.enm.mpoint.list,
paramsM: {material__isnull: 0}, paramsM: {material__isnull: 0},
apiObjM2: this.$API.mtm.mgroup.list,
paramsM2: {page: 0},
apiObj: this.$API.enm.mpoint.stat, apiObj: this.$API.enm.mpoint.stat,
params: { params: {
type: "day_s", type: "day_s",
@ -170,7 +186,7 @@ export default {
mpoint: null, mpoint: null,
type: "day_s", type: "day_s",
start_time: null, start_time: null,
end_time: null end_time: null,
}, },
chartOption: { chartOption: {
title: { title: {
@ -218,6 +234,7 @@ export default {
options: [ options: [
{ label: "班天", value: "day_s" }, { label: "班天", value: "day_s" },
{ label: "班月", value: "month_s" }, { label: "班月", value: "month_s" },
{ label: "班时", value: "hour_s"},
{ label: "小时", value: "hour"}, { label: "小时", value: "hour"},
{ label: "天", value: "day" }, { label: "天", value: "day" },
{ label: "月", value: "month"}, { label: "月", value: "month"},