From f360cde8ff0b28ba677a4693cf45f47f206dd746 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 21 五月 2025 17:52:54 +0800
Subject: [PATCH] 1、设备管理中设备属性的字段显隐权限调整到设备状态字段 2、设备日志添加批量导出功能
---
src/views/mdc/base/EquipmentList.vue | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index e43d9d8..e60d00a 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -20,9 +20,14 @@
<a-col :md="4" :sm="4">
<a-form-item label="杞﹂棿鍚嶇О">
- <!--<a-input placeholder="璇疯緭鍏ヨ溅闂村悕绉�" v-model="queryParam.productionName"></a-input>-->
<a-tree-select v-model="queryParam.productionName" :treeData="workshopTreeData" placeholder="璇烽�夋嫨杞﹂棿"
:treeDefaultExpandedKeys="treeDefaultExpandedKeys"></a-tree-select>
+ </a-form-item>
+ </a-col>
+
+ <a-col :md="4" :sm="4">
+ <a-form-item label="璁惧鐘舵��">
+ <j-dict-select-tag placeholder="璇烽�夋嫨璁惧鐘舵��" :triggerChange="true" dictCode="mdc_equipment_status" v-model="queryParam.equipmentStatus" allow-clear/>
</a-form-item>
</a-col>
@@ -239,39 +244,51 @@
title: '璁惧缂栧彿',
align: 'center',
dataIndex: 'equipmentId',
- width: 200
+ width: 225
// sorter: true
},
{
title: '璁惧鍚嶇О',
align: 'center',
- width: 200,
+ width: 225,
dataIndex: 'equipmentName'
},
{
title: '杞﹂棿',
align: 'center',
- width: 200,
+ width: 225,
dataIndex: 'productionName'
},
{
title: '璁惧绫诲瀷',
align: 'center',
- width: 200,
+ width: 225,
dataIndex: 'equipmentType'
},
{
title: '椹卞姩绫诲瀷',
align: 'center',
- width: 200,
+ width: 225,
dataIndex: 'driveType'
// sorter: true
},
{
+ title:'璁惧鐘舵��',
+ align:'center',
+ width: 100,
+ dataIndex:'equipmentStatus_dictText'
+ },
+ {
+ title:'璁惧灞炴��',
+ align:'center',
+ width: 100,
+ dataIndex:'attribute_dictText'
+ },
+ {
title: '鏈哄簥IP',
align: 'center',
- width: 200,
+ width: 150,
dataIndex: 'equipmentIp'
},
{
@@ -336,6 +353,12 @@
// sorter: true
},
{
+ title:'璁惧鐘舵��',
+ align:'center',
+ width: 100,
+ dataIndex:'equipmentStatus_dictText'
+ },
+ {
title: '鏈哄簥IP',
align: 'center',
width: 200,
--
Gitblit v1.9.3