From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分，与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw
---
src/views/eam/modules/equipmentNew/EquipmentProcessParametersList.vue | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentProcessParametersList.vue b/src/views/eam/modules/equipmentNew/EquipmentProcessParametersList.vue
index d844a55..18a7cbd 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentProcessParametersList.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentProcessParametersList.vue
@@ -24,7 +24,7 @@
<a-dropdown v-if="selectedRowKeys.length > 0" v-has="'accountSons:add&edit&delete&submit'">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
- <a-menu-item key="1" @click="handleSubmitBatch"><a-icon type="to-top" />鎻愪氦</a-menu-item>
+ <!-- <a-menu-item key="1" @click="handleSubmitBatch"><a-icon type="to-top" />鎻愪氦</a-menu-item> -->
</a-menu>
<a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
</a-dropdown>
@@ -48,7 +48,7 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
- <template
+ <!-- <template
v-for="col in columns"
:slot="col.dataIndex"
slot-scope='text, record, index'
@@ -78,7 +78,7 @@
>鎻愪氦</a-button>
</span>
</div>
- </template>
+ </template> -->
<!-- <span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">缂栬緫</a>
<a-divider type="vertical" />
@@ -147,47 +147,47 @@
title: '宸ヨ壓鍙傛暟缂栫爜',
align: "center",
dataIndex: 'processParametersNum',
- width:350,
+ // width:350,
},
{
title: '宸ヨ壓鍙傛暟鍚嶇О',
align: "center",
dataIndex: 'processParametersName',
- width:350,
+ // width:350,
},
{
title: '璁￠噺鍗曚綅',
align: "center",
dataIndex: 'processParametersUnitName',
- width:350,
+ // width:350,
},
{
title: '鍙傛暟鍊�',
align: "center",
dataIndex: 'parametersValue',
- scopedSlots: {
- customRender: 'parametersValue'
- },
- width:350,
+ // scopedSlots: {
+ // customRender: 'parametersValue'
+ // },
+ // width:350,
},
{
title: '澶囨敞',
align: "center",
dataIndex: 'remark',
- scopedSlots: {
- customRender: 'remark'
- },
+ // scopedSlots: {
+ // customRender: 'remark'
+ // },
},
- {
- title: '鎿嶄綔',
- align: "center",
- dataIndex: 'action',
- scopedSlots: {
- customRender: 'action'
- },
- width:200,
- fixed: 'right',
- },
+ // {
+ // title: '鎿嶄綔',
+ // align: "center",
+ // dataIndex: 'action',
+ // scopedSlots: {
+ // customRender: 'action'
+ // },
+ // width:200,
+ // fixed: 'right',
+ // },
],
url: {
list: "/eam/equipmentProcessParameters/list",
@@ -281,8 +281,13 @@
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
-
+
+ },
+ mounted(){
+ this.$bus.$on('loadData', (data) => {
+ this.loadData();
+ });
}
}
</script>
--
Gitblit v1.9.3