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

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

This commit is contained in:
shijing 2024-04-26 17:03:35 +08:00
parent 0bff96af1c 0460e2636f
commit de77f4eaee
5 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/views/em/mpoint.vue
View File

@ -55,11 +55,20 @@
</template>
</el-table-column>
<el-table-column label="采集间隔(s)" prop="interval" width="100"></el-table-column>
<el-table-column label="值类型" prop="val_type"></el-table-column>
<el-table-column label="单位" prop="unit"></el-table-column>
<el-table-column label="计量物料" prop="material_name"></el-table-column>
<el-table-column label="所属工段" prop="mgroup_name"></el-table-column>
<el-table-column label="创建时间" prop="create_time" sortable></el-table-column>
<el-table-column label="值类型" prop="val_type" width="80"></el-table-column>
<el-table-column label="单位" prop="unit" width="80"></el-table-column>
<el-table-column label="计量物料" prop="material_name" width="100"></el-table-column>
<el-table-column label="所属工段" prop="mgroup_name" width="100"></el-table-column>
<el-table-column label="最近记录" show-overflow-tooltip width="180">
<template #default="scope">
<div v-if="scope.row.last_data">
<div>{{scope.row.last_data.last_val}}</div>
<div>{{scope.row.last_data.last_timex}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="create_time" show-overflow-tooltip sortable width="160"></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="140">
<template #default="scope">
<el-button link size="small" @click="table_edit(scope.row)" v-auth="'mpoint.update'" type="primary">编辑</el-button>

2
src/views/em/mpoint_form.vue
View File

@ -303,7 +303,7 @@ export default {
//获取集合列表
getMgroup() {
this.$API.mtm.mgroup.list
.req({ page: 0, cate: "section" })
.req({ page: 0 })
.then((res) => {
this.mgroupOptions = res;
});

1
src/views/enm_base/material.vue
View File

@ -74,6 +74,7 @@ import saveDialog from "./material_form.vue";
40:'辅助材料',
50:'加工工具',
60:'辅助工装',
70:'办公用品'
},
}
},

9
src/views/enm_base/mgroup.vue
View File

@ -73,6 +73,11 @@
prop="belong_dept_name"
min-width="150"
></el-table-column>
<el-table-column
label="排序"
prop="sort"
width="50"
></el-table-column>
<el-table-column
label="创建时间"
prop="create_time"
@ -130,9 +135,7 @@ export default {
data() {
return {
apiObj: this.$API.mtm.mgroup.list,
query: {
cate: "section",
},
query: {},
dialog: {
save: false,
permission: false,

7
src/views/enm_base/mgroup_form.vue
View File

@ -113,6 +113,13 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number
v-model="form.sort"
:min="1"
controls-position="right"
></el-input-number>
</el-form-item>
</el-form>
</el-main>
<el-footer>