From b9989d6d13e894b6be78fc7fcfa283f77eb55821 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 18 二月 2025 17:41:36 +0800
Subject: [PATCH] 1、调整设备维修时长与故障停机时长页面的时长精度为2且单位调整由分钟调整为小时 2、调整设备维修时长与故障停机时长页面的计算接口传参方式 3、解决设备维修时长与故障停机时长页面的计算弹窗中输入框非空校验无效的问题

---
 src/views/mdc/base/EquipmentList.vue |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index e43d9d8..8af88e6 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,45 @@
                   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: '鏈哄簥IP',
                   align: 'center',
-                  width: 200,
+                  width: 150,
                   dataIndex: 'equipmentIp'
                 },
                 {
@@ -336,6 +347,12 @@
                   // sorter: true
                 },
                 {
+                  title:'璁惧鐘舵��',
+                  align:'center',
+                  width: 100,
+                  dataIndex:'equipmentStatus_dictText'
+                },
+                {
                   title: '鏈哄簥IP',
                   align: 'center',
                   width: 200,

--
Gitblit v1.9.3