From aecdfb8c9f8c5f20dc9adb61adf0a9c1385b9f14 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 17 一月 2024 09:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/common/teststandardradio.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/common/teststandardradio.vue b/src/views/common/teststandardradio.vue
index 075fd96..bd569a7 100644
--- a/src/views/common/teststandardradio.vue
+++ b/src/views/common/teststandardradio.vue
@@ -44,7 +44,7 @@
align="center"
width="50"
/>
- <el-table-column label="绾胯姱" prop="wireCore" align="center" />
+ <!-- <el-table-column label="绾胯姱" prop="wireCore" align="center" /> -->
<el-table-column label="鍙傛暟缂栧彿" prop="code" align="center" />
<el-table-column label="鍙傛暟椤�" prop="parameterItem" align="center" />
<el-table-column
@@ -57,8 +57,8 @@
prop="parameterFormat"
align="center"
/>
- <el-table-column label="閫氶亾" prop="aisle" align="center" />
- <el-table-column label="閮ㄤ綅" prop="position" align="center" />
+ <!-- <el-table-column label="閫氶亾" prop="aisle" align="center" />
+ <el-table-column label="閮ㄤ綅" prop="position" align="center" /> -->
<el-table-column label="鍗曚綅" prop="unit" align="center" />
</el-table>
</el-col>
@@ -187,6 +187,15 @@
},
{
minWidth: '120',
+ prop: 'operationName',
+ label: '宸ュ簭鍚嶇О',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '120',
prop: 'remark',
label: '澶囨敞',
sort: true,
--
Gitblit v1.9.3