diff --git a/src/views/em/mpoint.vue b/src/views/em/mpoint.vue index f1c9b2a8..3b19dafd 100644 --- a/src/views/em/mpoint.vue +++ b/src/views/em/mpoint.vue @@ -55,11 +55,20 @@ - - - - - + + + + + + + + {{scope.row.last_data.last_val}} + {{scope.row.last_data.last_timex}} + + + + + 编辑 diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue index 5e1912b9..056dc6f3 100644 --- a/src/views/em/mpoint_form.vue +++ b/src/views/em/mpoint_form.vue @@ -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; }); diff --git a/src/views/enm_base/material.vue b/src/views/enm_base/material.vue index 381ddf5a..2750dfd1 100644 --- a/src/views/enm_base/material.vue +++ b/src/views/enm_base/material.vue @@ -74,6 +74,7 @@ import saveDialog from "./material_form.vue"; 40:'辅助材料', 50:'加工工具', 60:'辅助工装', + 70:'办公用品' }, } }, diff --git a/src/views/enm_base/mgroup.vue b/src/views/enm_base/mgroup.vue index 5212cc8f..ff159fd4 100644 --- a/src/views/enm_base/mgroup.vue +++ b/src/views/enm_base/mgroup.vue @@ -73,6 +73,11 @@ prop="belong_dept_name" min-width="150" > + + + +