From d0223045d2dd1cccc26c995c972e80e60bd19b26 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 02 六月 2025 08:45:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/EquipmentList.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index 3d34ad3..44375e9 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -13,8 +13,8 @@
</a-col>
<a-col :md="4" :sm="4">
- <a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="璇疯緭鍏ヨ澶囧悕绉�" v-model="queryParam.equipmentName"></a-input>
+ <a-form-item label="瀹夎浣嶇疆">
+ <a-input placeholder="璇疯緭鍏ュ畨瑁呬綅缃�" v-model="queryParam.equipmentName"></a-input>
</a-form-item>
</a-col>
@@ -151,7 +151,7 @@
width: 200
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: 'center',
width: 200,
dataIndex: 'equipmentName'
@@ -250,10 +250,17 @@
// sorter: true
},
{
+ title: '瀹夎浣嶇疆',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ width: 200
+ // sorter: true
+ },
+ {
title: '璁惧鍚嶇О',
align: 'center',
width: 200,
- dataIndex: 'equipmentName'
+ dataIndex: 'equipmentAddress'
},
{
title: '杞﹂棿',
@@ -323,7 +330,7 @@
// sorter: true
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: 'center',
width: 200,
dataIndex: 'equipmentName'
--
Gitblit v1.9.3