From 3bda22fd0c61d053f0f817a95230d39c0c6baddb Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 17 一月 2024 16:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/equipment/index.vue | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 9fd2e4d..418e866 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -97,6 +97,7 @@
// 璁惧缂栧彿
{
minWidth: '30',
+ width: '200',
prop: 'number',
label: '璁惧缂栧彿',
sort: true,
@@ -110,8 +111,19 @@
// 璁惧鍚嶇О
{
minWidth: '30',
+ width: '100',
prop: 'name',
label: '璁惧鍚嶇О',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ // 鐘舵��
+ {
+ minWidth: '30',
+ prop: 'state',
+ label: '鐘舵��',
sort: true,
isTrue: true,
isSearch: true,
@@ -151,15 +163,15 @@
searchInfoType: 'text'
},
// 閭
- {
- minWidth: '30',
- prop: 'email',
- label: '閭',
- sort: true,
- isTrue: true,
- isSearch: false,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '30',
+ // prop: 'email',
+ // label: '閭',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: false,
+ // searchInfoType: 'text'
+ // },
// 渚涘簲鍟�
{
minWidth: '30',
@@ -193,7 +205,7 @@
// 鍒堕�犳棩鏈�
{
minWidth: '150',
- width: '250',
+ width: '100',
prop: 'manufactureDate',
label: '鍒堕�犳棩鏈�',
sort: true,
@@ -205,7 +217,7 @@
// 瀹夎鏃ユ湡
{
minWidth: '150',
- width: '250',
+ width: '100',
prop: 'installDate',
label: '瀹夎鏃ユ湡',
sort: true,
@@ -213,16 +225,6 @@
isSearch: true,
formatter: this.formatReceiveTime,
searchInfoType: 'datetimerange'
- },
- // 鐘舵��
- {
- minWidth: '30',
- prop: 'state',
- label: '鐘舵��',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
}
],
toolbar: [],
--
Gitblit v1.9.3