From 0460e2636f7edf5e2ffe7ed850348383e5259166 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 26 Apr 2024 12:20:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20enm=20mgroup=20=E4=B8=8D=E9=A2=84?=
 =?UTF-8?q?=E5=85=88=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/mpoint.vue            | 19 ++++++++++++++-----
 src/views/em/mpoint_form.vue       |  2 +-
 src/views/enm_base/material.vue    |  1 +
 src/views/enm_base/mgroup.vue      |  9 ++++++---
 src/views/enm_base/mgroup_form.vue |  7 +++++++
 5 files changed, 29 insertions(+), 9 deletions(-)

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 @@
             </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>
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"
 				></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,
diff --git a/src/views/enm_base/mgroup_form.vue b/src/views/enm_base/mgroup_form.vue
index ed6e54b9..8245cc67 100644
--- a/src/views/enm_base/mgroup_form.vue
+++ b/src/views/enm_base/mgroup_form.vue
@@ -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>