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/site/AreaList.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/views/eam/modules/site/AreaList.vue b/src/views/eam/modules/site/AreaList.vue
index 3382b7a..ef83e73 100644
--- a/src/views/eam/modules/site/AreaList.vue
+++ b/src/views/eam/modules/site/AreaList.vue
@@ -8,7 +8,7 @@
class="action-jeecg actionarea1"
style="font-size: 18px;"
/>
- 杞﹂棿
+ 宸ュ尯
</template>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -23,12 +23,12 @@
:sm="8"
>
<a-form-item
- label="杞﹂棿缂栧彿"
+ label="宸ュ尯缂栧彿"
:labelCol="{span: 5}"
:wrapperCol="{span: 18, offset: 1}"
>
<j-input
- placeholder="璇疯緭鍏ヨ溅闂寸紪鍙锋煡璇�"
+ placeholder="璇疯緭鍏ュ伐鍖虹紪鍙锋煡璇�"
v-model="queryParam.num"
></j-input>
</a-form-item>
@@ -38,12 +38,12 @@
:sm="8"
>
<a-form-item
- label="杞﹂棿鍚嶇О"
+ label="宸ュ尯鍚嶇О"
:labelCol="{span: 5}"
:wrapperCol="{span: 18, offset: 1}"
>
<j-input
- placeholder="璇疯緭鍏ヨ溅闂村悕绉版煡璇�"
+ placeholder="璇疯緭鍏ュ伐鍖哄悕绉版煡璇�"
v-model="queryParam.name"
></j-input>
</a-form-item>
@@ -160,6 +160,16 @@
:length="15"
/>
</span>
+ <span
+ slot="teamNames"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="15"
+ />
+ </span>
+
<!--鐘舵�佹爮涓�у睍绀�-->
<span
slot="status"
@@ -282,17 +292,24 @@
}
},
{
- title: '杞﹂棿缂栧彿',
+ title: '宸ュ尯缂栧彿',
align: "center",
dataIndex: 'num',
sorter: true,
},
{
- title: '杞﹂棿鍚嶇О',
+ title: '宸ュ尯鍚嶇О',
dataIndex: 'name',
align: "center",
sorter: true,
},
+ {
+ title: '缁翠慨鐝粍',
+ dataIndex: 'teamNames',
+ align: "center",
+ sorter: true,
+ scopedSlots: { customRender: 'teamNames' },
+ },
// {
// title: '閮ㄩ棬',
// align: 'center',
--
Gitblit v1.9.3