From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/eam/modules/faultCause/FaultCause2List.vue | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/src/views/eam/modules/faultCause/FaultCause2List.vue b/src/views/eam/modules/faultCause/FaultCause2List.vue
index fa3495f..96d166d 100644
--- a/src/views/eam/modules/faultCause/FaultCause2List.vue
+++ b/src/views/eam/modules/faultCause/FaultCause2List.vue
@@ -92,9 +92,38 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps:getCheckboxProps}"
@change="handleTableChange"
- :scroll="{ x: 'calc(1200px + 50%)', y: 900 }"
+ :scroll="{ x: true}"
>
-
+ <template
+ slot="num"
+ slot-scope="text"
+ >
+ <a-tooltip
+ placement="top"
+ :title="text"
+ trigger="hover"
+ >
+ <div>
+ <template slot="title"> </template>
+ <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
+ </div>
+ </a-tooltip>
+ </template>
+ <template
+ slot="name"
+ slot-scope="text"
+ >
+ <a-tooltip
+ placement="top"
+ :title="text"
+ trigger="hover"
+ >
+ <div>
+ <template slot="title"> </template>
+ <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
+ </div>
+ </a-tooltip>
+ </template>
<!--鐘舵�佹爮涓�у睍绀�-->
<!-- <span
slot="status"
@@ -225,17 +254,27 @@
title: '鏁呴殰鍘熷洜缂栫爜',
align: "center",
dataIndex: 'num',
+ // width: 100,
+ // scopedSlots: {
+ // customRender: 'num'
+ // },
+ // ellipsis: true,
},
{
title: '鏁呴殰鍘熷洜鍚嶇О',
align: "center",
dataIndex: 'name',
+ // width: 100,
+ // scopedSlots: {
+ // customRender: 'name'
+ // },
+ // ellipsis: true,
},
- {
- title: '鏁呴殰鍘熷洜鍒嗙被',
- align: "center",
- dataIndex: 'parentName',
- },
+ // {
+ // title: '鏁呴殰鍘熷洜鍒嗙被',
+ // align: "center",
+ // dataIndex: 'parentName',
+ // },
{
title: '鍒涘缓浜�',
align: "center",
--
Gitblit v1.9.3