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 |   75 ++++++++++++++++---------------------
 1 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index 6cc55f5..e60d00a 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -20,23 +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="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="queryParam.deviceLevel"
-                                 allow-clear/>
-            </a-form-item>
-          </a-col>
-
-          <a-col :md="4" :sm="4">
-            <a-form-item label="璁惧绉嶇被">
-              <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="queryParam.deviceCategory"
-                                 allow-clear/>
+            <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>
 
@@ -195,23 +186,16 @@
             dataIndex: 'equipmentIp'
           },
           {
-            title: '璁惧鍔熺巼',
+            title: '鏈哄簥绔彛',
             align: 'center',
             width: 200,
-            dataIndex: 'devicePower'
+            dataIndex: 'dataPort'
           },
           {
             title: '閮ㄩ棬',
             align: 'center',
             width: 200,
             dataIndex: 'orgCodeTxt'
-          },
-
-          {
-            title: '绯荤粺鐗堟湰',
-            align: 'center',
-            width: 200,
-            dataIndex: 'systemVersion'
           },
           {
             title: '鎿嶄綔',
@@ -260,52 +244,58 @@
                   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'
                 },
                 {
-                  title: '璁惧鍔熺巼',
+                  title: '鏈哄簥绔彛',
                   align: 'center',
                   width: 200,
-                  dataIndex: 'devicePower'
-                },
-                {
-                  title: '绯荤粺鐗堟湰',
-                  align: 'center',
-                  width: 200,
-                  dataIndex: 'systemVersion'
+                  dataIndex: 'dataPort'
                 },
                 {
                   title: '鎿嶄綔',
@@ -363,29 +353,28 @@
                   // sorter: true
                 },
                 {
+                  title:'璁惧鐘舵��',
+                  align:'center',
+                  width: 100,
+                  dataIndex:'equipmentStatus_dictText'
+                },
+                {
                   title: '鏈哄簥IP',
                   align: 'center',
                   width: 200,
                   dataIndex: 'equipmentIp'
                 },
                 {
-                  title: '璁惧鍔熺巼',
+                  title: '鏈哄簥绔彛',
                   align: 'center',
                   width: 200,
-                  dataIndex: 'devicePower'
+                  dataIndex: 'dataPort'
                 },
                 {
                   title: '閮ㄩ棬',
                   align: 'center',
                   width: 200,
                   dataIndex: 'orgCodeTxt'
-                },
-
-                {
-                  title: '绯荤粺鐗堟湰',
-                  align: 'center',
-                  width: 200,
-                  dataIndex: 'systemVersion'
                 },
                 {
                   title: '鎿嶄綔',

--
Gitblit v1.9.3