From ceed2940c085a05378c5d01e08e82a98a17f317b Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 23 九月 2024 09:27:57 +0800
Subject: [PATCH] 统计分析、统计图表、对比分析、设备日利用率、设备日利用率对比、利用率走势分析以及利用率分段分析左侧树数据新增参数key,用来过滤异常状态设备

---
 src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue b/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue
index 8c64516..6c9de01 100644
--- a/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue
+++ b/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue
@@ -19,7 +19,7 @@
         size='middle'
         bordered
         rowKey='id'
-        :scroll='{x:true}'
+        :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
         :columns='columns'
         :dataSource='dataSource'
         :pagination='ipagination'
@@ -67,6 +67,7 @@
       // disableMixinCreated: true,
       // originTargetKeys: [],
       // 琛ㄥご
+      disableMixinCreated: true,
       columns: [
         {
           title: '#',
@@ -79,7 +80,7 @@
           }
         },
         {
-          title: '璁惧缂栫爜',
+          title: '缁熶竴缂栫爜',
           align: 'center',
           dataIndex: 'equipmentNum'
         },
@@ -132,10 +133,11 @@
           title: '璋冨叆绠$悊浜�',
           align: 'center',
           dataIndex: 'inManagerName'
-        }, {
+        },
+         {
           title: '璋冨叆璐d换鐝粍',
           align: 'center',
-          dataIndex: 'responsibilityTeamId'
+          dataIndex: 'responsibilityTeamName'
 
         },
         {

--
Gitblit v1.9.3