From 9521a01b0cbe88050c6f3d24cb0e227dda4aa268 Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期五, 01 九月 2023 17:34:26 +0800
Subject: [PATCH] 基础数据模块/设备处理/设备使用（界面长度适配调整， 编码 单据号，名称 超长字符 单独处理）
---
src/views/eam/ProcessParametersList.vue | 4
src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue | 2
src/views/eam/modules/processParameters/ProcessParametersRight.vue | 2
src/views/eam/TransferMethodList.vue | 4
src/views/eam/modules/transferMethod/TransferMethodRight.vue | 2
src/views/eam/modules/faultCause/FaultCause2List.vue | 29 +++++
src/views/eam/modules/faultType/FaultType2List.vue | 30 +++++
src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue | 40 +++++---
src/views/eam/EquipmentTransferList.vue | 16 ++
src/views/eam/FaultCauseList.vue | 4
src/views/eam/EquipmentTransferInList.vue | 18 ++
src/views/eam/RiskPreventionList.vue | 38 +++++++
src/views/eam/EquipmentChangeList.vue | 18 ++
src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue | 51 ++++++---
14 files changed, 197 insertions(+), 61 deletions(-)
diff --git a/src/views/eam/EquipmentChangeList.vue b/src/views/eam/EquipmentChangeList.vue
index f3a8e25..5b05dac 100644
--- a/src/views/eam/EquipmentChangeList.vue
+++ b/src/views/eam/EquipmentChangeList.vue
@@ -86,13 +86,13 @@
@click='onClearSelected'
>娓呯┖</a>
</div>
-
+<!--X杞存粦鍔� :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"-->
<a-table
ref='table'
size='middle'
bordered
rowKey='id'
- :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
+ :scroll="{ x: true }"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -101,7 +101,14 @@
:customRow='clickThenSelect'
@change='handleTableChange'
>
-
+ <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>
<!-- <span
slot='action'
slot-scope='text, record'
@@ -216,7 +223,10 @@
{
title: '鍗曟嵁鍙�',
align: 'center',
- dataIndex: 'num'
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true,
},
{
title: '鍒涘缓浜�',
diff --git a/src/views/eam/EquipmentTransferInList.vue b/src/views/eam/EquipmentTransferInList.vue
index ea794cc..0fe667c 100644
--- a/src/views/eam/EquipmentTransferInList.vue
+++ b/src/views/eam/EquipmentTransferInList.vue
@@ -86,13 +86,13 @@
@click='onClearSelected'
>娓呯┖</a>
</div>
-
+<!-- X杞存粦鍔� :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"-->
<a-table
ref='table'
size='middle'
bordered
rowKey='id'
- :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
+ :scroll="{ x: true}"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -101,7 +101,14 @@
:customRow='clickThenSelect'
@change='handleTableChange'
>
-
+ <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>
<span
slot='action'
slot-scope='text, record'
@@ -195,7 +202,10 @@
{
title: '鍗曟嵁鍙�',
align: 'center',
- dataIndex: 'num'
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true,
},
{
title: '璋冨嚭鍏徃',
diff --git a/src/views/eam/EquipmentTransferList.vue b/src/views/eam/EquipmentTransferList.vue
index 79da946..248fa2a 100644
--- a/src/views/eam/EquipmentTransferList.vue
+++ b/src/views/eam/EquipmentTransferList.vue
@@ -91,7 +91,7 @@
size='middle'
bordered
rowKey='id'
- :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
+ :scroll="{ x: true }"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -101,7 +101,14 @@
@change='handleTableChange'
>
-
+ <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>
<span
@@ -199,7 +206,10 @@
{
title: '鍗曟嵁鍙�',
align: 'center',
- dataIndex: 'num'
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true,
},
{
title: '璋冨嚭鍏徃',
diff --git a/src/views/eam/FaultCauseList.vue b/src/views/eam/FaultCauseList.vue
index 4b78026..4a6a66d 100644
--- a/src/views/eam/FaultCauseList.vue
+++ b/src/views/eam/FaultCauseList.vue
@@ -4,13 +4,13 @@
:gutter="16"
>
<a-col
- :md="6"
+ :md="4"
:sm="24"
>
<fault-cause-left />
</a-col>
<a-col
- :md="24-6"
+ :md="24-4"
:sm="24"
>
<fault-cause-right />
diff --git a/src/views/eam/ProcessParametersList.vue b/src/views/eam/ProcessParametersList.vue
index 6ca35ed..2ae8d16 100644
--- a/src/views/eam/ProcessParametersList.vue
+++ b/src/views/eam/ProcessParametersList.vue
@@ -4,13 +4,13 @@
:gutter="16"
>
<a-col
- :md="6"
+ :md="4"
:sm="24"
>
<process-parameters-category-left @clickTreeNode="getSelectNode" />
</a-col>
<a-col
- :md="24-6"
+ :md="24-4"
:sm="24"
>
<process-parameters-right :recordSelect="currentNodeSelect" />
diff --git a/src/views/eam/RiskPreventionList.vue b/src/views/eam/RiskPreventionList.vue
index 405e69a..26a3f14 100644
--- a/src/views/eam/RiskPreventionList.vue
+++ b/src/views/eam/RiskPreventionList.vue
@@ -75,6 +75,30 @@
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
class='j-table-force-nowrap'
@change='handleTableChange'>
+ <template slot="description" 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="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="measure" 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='htmlSlot' slot-scope='text'>
<div v-html='text'></div>
@@ -154,7 +178,9 @@
{
title: ' 鍗遍櫓婧愮紪鐮�',
align: 'center',
- dataIndex: 'num'
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ ellipsis: true,
},
{
title: '鍗遍櫓婧愬悕绉�',
@@ -164,12 +190,18 @@
{
title: '鍗遍櫓鎻忚堪',
align: 'center',
- dataIndex: 'description'
+ dataIndex: 'description',
+ scopedSlots: { customRender: 'description' },
+ width: 100,
+ ellipsis: true,
},
{
title: '闃叉帶鎺柦',
align: 'center',
- dataIndex: 'measure'
+ dataIndex: 'measure',
+ scopedSlots: { customRender: 'measure' },
+ width: 100,
+ ellipsis: true,
},
{
title: '鍒涘缓浜�',
diff --git a/src/views/eam/TransferMethodList.vue b/src/views/eam/TransferMethodList.vue
index 5a83bf0..c2f4727 100644
--- a/src/views/eam/TransferMethodList.vue
+++ b/src/views/eam/TransferMethodList.vue
@@ -4,13 +4,13 @@
:gutter="16"
>
<a-col
- :md="6"
+ :md="4"
:sm="24"
>
<transfer-method-category-left @clickTreeNode="getSelectNode" />
</a-col>
<a-col
- :md="24-6"
+ :md="24-4"
:sm="24"
>
<transfer-method-right :recordSelect="currentNodeSelect" />
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
index 3898f8a..c0d27dc 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
@@ -93,9 +93,16 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps:getCheckboxProps}"
@change="handleTableChange"
- :scroll="{ x: true, 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>
<!--鐘舵�佹爮涓�у睍绀�-->
<!-- <span
slot="status"
@@ -240,7 +247,9 @@
title: '鍒嗙被缂栫爜',
align: "center",
dataIndex: 'num',
- width: 200 ,
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true,
// scopedSlots: {
// customRender: 'num',
// },
@@ -251,7 +260,7 @@
align: "center",
dataIndex: 'name',
- width: 200 ,
+
// scopedSlots: {
// customRender: 'name',
// },
@@ -266,7 +275,7 @@
// customRender: 'name',
// },
// sorter: true,
- width: 200 ,
+
},
{
title: '鎶�鏈姸鎬侀壌瀹氬懆鏈�',
@@ -277,31 +286,32 @@
// customRender: 'name',
// },
// sorter: true,
- width: 200 ,
+
},
{
title: '鍒涘缓浜�',
align: "center",
dataIndex: 'createBy',
- width: 200 ,
- },
- {
- title: '鍒涘缓鏃堕棿',
- align: "center",
- dataIndex: 'createTime',
- width: 200 ,
+
},
{
title: '淇敼浜�',
align: "center",
dataIndex: 'updateBy',
- width: 200 ,
+
},
+ {
+ title: '鍒涘缓鏃堕棿',
+ align: "center",
+ dataIndex: 'createTime',
+
+ },
+
{
title: '淇敼鏃堕棿',
align: "center",
dataIndex: 'updateTime',
- width: 200 ,
+
},
// {
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
index b4a26f0..1ad133f 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
@@ -95,7 +95,7 @@
</a-form-item>
</a-col>
</a-row>
-
+
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
@@ -148,7 +148,7 @@
</a-form-item>
</a-col>
</a-row>
-
+
</a-form>
<a-divider v-if="title!='鏂板'" orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 閫夋嫨瀛愯澶囧垎绫讳娇鍏惰窡闅忕埗璁惧鍒嗙被灞炴�� </a-divider>
<a-tabs
@@ -159,7 +159,7 @@
<a-tab-pane
tab='瀛愯澶囧垎绫�'
key='1'
-
+
>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
@@ -176,11 +176,23 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"
- :scroll="{ x: true, y: 900 }"
- ></a-table>
+ :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>
+
+ </a-table>
+
+
</a-tab-pane>
</a-tabs>
-
+
</a-spin>
<template slot="footer">
@@ -307,7 +319,9 @@
title: '鍒嗙被缂栫爜',
align: "center",
dataIndex: 'num',
- width: 220,
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true,
// scopedSlots: {
// customRender: 'num',
// },
@@ -318,7 +332,7 @@
align: "center",
dataIndex: 'name',
- width: 220,
+
// scopedSlots: {
// customRender: 'name',
// },
@@ -333,31 +347,32 @@
// customRender: 'name',
// },
// sorter: true,
- width: 220,
+
},
{
title: '鍒涘缓浜�',
align: "center",
dataIndex: 'createBy',
- width: 220,
- },
- {
- title: '鍒涘缓鏃堕棿',
- align: "center",
- dataIndex: 'createTime',
- width: 220,
+
},
{
title: '淇敼浜�',
align: "center",
dataIndex: 'updateBy',
- width: 220,
+
},
+ {
+ title: '鍒涘缓鏃堕棿',
+ align: "center",
+ dataIndex: 'createTime',
+
+ },
+
{
title: '淇敼鏃堕棿',
align: "center",
dataIndex: 'updateTime',
- width: 220,
+
},
],
//鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴��
diff --git a/src/views/eam/modules/faultCause/FaultCause2List.vue b/src/views/eam/modules/faultCause/FaultCause2List.vue
index fa3495f..fa68cdb 100644
--- a/src/views/eam/modules/faultCause/FaultCause2List.vue
+++ b/src/views/eam/modules/faultCause/FaultCause2List.vue
@@ -92,9 +92,24 @@
: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,11 +240,21 @@
title: '鏁呴殰鍘熷洜缂栫爜',
align: "center",
dataIndex: 'num',
+ width: 100,
+ scopedSlots: {
+ customRender: 'num'
+ },
+ ellipsis: true,
},
{
title: '鏁呴殰鍘熷洜鍚嶇О',
+ width: 100,
align: "center",
dataIndex: 'name',
+ scopedSlots: {
+ customRender: 'name'
+ },
+ ellipsis: true,
},
{
title: '鏁呴殰鍘熷洜鍒嗙被',
diff --git a/src/views/eam/modules/faultType/FaultType2List.vue b/src/views/eam/modules/faultType/FaultType2List.vue
index 640be6d..3177868 100644
--- a/src/views/eam/modules/faultType/FaultType2List.vue
+++ b/src/views/eam/modules/faultType/FaultType2List.vue
@@ -97,9 +97,24 @@
: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"
@@ -245,6 +260,9 @@
title: '鏁呴殰绫诲瀷缂栫爜',
align: 'center',
dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true,
// scopedSlots: {
// customRender: 'num'
// },
@@ -252,12 +270,13 @@
},
{
title: '鏁呴殰绫诲瀷鍚嶇О',
-
+ width: 100,
align: 'center',
dataIndex: 'name',
scopedSlots: {
customRender: 'name'
},
+ ellipsis: true,
sorter: true
},
{
@@ -280,6 +299,11 @@
align: 'center',
dataIndex: 'updateTime'
},
+ {
+ title: '澶囨敞',
+ align: 'center',
+ dataIndex: 'remark'
+ },
// {
// title: '鐘舵��',
diff --git a/src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue b/src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue
index 80f8c0e..c5a31b5 100644
--- a/src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue
+++ b/src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue
@@ -88,7 +88,7 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"
- :scroll="{ x: 'calc(1200px + 50%)', y: 900 }"
+ :scroll="{ x: true}"
>
<!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
<span
diff --git a/src/views/eam/modules/processParameters/ProcessParametersRight.vue b/src/views/eam/modules/processParameters/ProcessParametersRight.vue
index 571873c..3ef277c 100644
--- a/src/views/eam/modules/processParameters/ProcessParametersRight.vue
+++ b/src/views/eam/modules/processParameters/ProcessParametersRight.vue
@@ -88,7 +88,7 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"
- :scroll="{ x: 'calc(1200px + 50%)', y: 900 }"
+ :scroll="{ x: true}"
>
<!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
<span
diff --git a/src/views/eam/modules/transferMethod/TransferMethodRight.vue b/src/views/eam/modules/transferMethod/TransferMethodRight.vue
index c51fc28..87d830c 100644
--- a/src/views/eam/modules/transferMethod/TransferMethodRight.vue
+++ b/src/views/eam/modules/transferMethod/TransferMethodRight.vue
@@ -88,7 +88,7 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"
- :scroll="{ x: 'calc(1200px + 50%)', y: 900 }"
+ :scroll="{ x:true}"
>
<!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
<span
--
Gitblit v1.9.3