From 547aab154e85a9a89f1e320f92bd43854d10faeb Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 14 十二月 2023 14:12:45 +0800
Subject: [PATCH] 1、调整车间看板页面详情弹窗描述列表内容字段 2、报警分析页面在原有表格中为每个报警号增加子表格，内容为出现此报警号的设备ID以及报警时间等 3、报警分析页面表格请求数据设置加载中动画 4、调整设备参数阈值管理页面添加或编辑阈值上下限输入框为数字输入框，避免上下限数字比较大小时出现问题

---
 src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue |   44 ++++++++++++++++++++++++++++++--------------
 1 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue b/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue
index 9b5a245..eac5e23 100644
--- a/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue
+++ b/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue
@@ -42,15 +42,16 @@
         size="middle"
         bordered
         rowKey="id"
-        :scroll="{x:true}"
+        :scroll="{ x: 'calc(1000px + 5%)', y: 900 }"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :maxHeight="800"
         @change="handleTableChange">
 
         <template slot="htmlSlot" slot-scope="text">
+          <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
           <div v-html="text"></div>
         </template>
         <template slot="equipmentPhoto" slot-scope="text,record">
@@ -143,75 +144,90 @@
           //   dataIndex: 'equipmentId'
           // },
           {
-            title:'璁惧缂栫爜',
+            title:'缁熶竴缂栫爜',
             align:"center",
-            dataIndex: 'equipmentNum'
+            dataIndex: 'equipmentNum',
+            width:200
           },
           {
             title:'璧勪骇缂栫爜',
             align:"center",
-            dataIndex: 'assetNumber'
+            dataIndex: 'assetNumber',
+            width:200
           },
           {
             title:'鐗圭璁惧',
             align:"center",
             dataIndex: 'specificEquipment_dictText',
+            width:200
           },
           {
             title:'璁惧鍚嶇О',
             align:"center",
-            dataIndex: 'equipmentName'
+            dataIndex: 'equipmentName',
+            width:200
           },
           {
             title:'璁惧鍨嬪彿',
             align:"center",
-            dataIndex: 'model'
+            dataIndex: 'model',
+            width:200
           },
           {
             title:'璁惧瑙勬牸',
             align:"center",
-            dataIndex: 'specification'
+            dataIndex: 'specification',
+            width:200
           },
           {
             title:'璁惧鐘舵��',
             align:"center",
             dataIndex: 'equipmentStatus_dictText',
+            width:200
           },
           {
             title:'鎶�鏈姸鎬�',
             align:"center",
             dataIndex: 'technologyStatus_dictText',
+            width:200
           },
           {
             title:'璁惧浣嶇疆',
             align:"center",
-            dataIndex: 'location'
+            dataIndex: 'location',
+            width:200
           },
           {
             title:'閲嶈搴�',
             align:"center",
-            dataIndex: 'equipmentImportanceId_dictText'
+            dataIndex: 'equipmentImportanceId_dictText',
+            width:200
+
           },
           {
             title:'璁惧鍥剧墖',
             align:"center",
             dataIndex: 'equipmentPhoto',
-            scopedSlots: {customRender: "equipmentPhoto"}
+            scopedSlots: {customRender: "equipmentPhoto"},
+            width:200
           },
           {
             title:'鍑忓皯鏂瑰紡',
             align:"center",
-            dataIndex: 'reduceMethod_dictText'
+            dataIndex: 'reduceMethod_dictText',
+            width:200
           },
           {
             title:'澶勭疆鍘熷洜',
             align:"center",
-            dataIndex: 'disposalReason'
+            dataIndex: 'disposalReason',
+            width:200
           },
           {
             title:'澶勭疆鏃ユ湡',
             align:"center",
-            dataIndex: 'disposalDate'
+            dataIndex: 'disposalDate',
+            width:200
           },
           // {
           //   title: '鎿嶄綔',

--
Gitblit v1.9.3