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/equipmentCategory/EquipmentCategoryLeft.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue
index d0bf837..f8e4bbe 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue
@@ -77,13 +77,13 @@
placement="bottomCenter"
>
<a-menu slot="overlay">
- <a-menu-item v-if="key!=-1">
+ <a-menu-item v-if="key!=-1" v-has="'equipmentCategory:add&Edit&delete'">
<a
href="javascript:;"
@click="handleEdit(entity)"
>缂栬緫</a>
</a-menu-item>
- <a-menu-item>
+ <a-menu-item v-has="'equipmentCategory:add&Edit&delete'">
<a
href="javascript:;"
@click="handleAdd(entity)"
@@ -91,7 +91,7 @@
娣诲姞瀛愮被鍒�
</a>
</a-menu-item>
- <a-menu-item v-if="key!=-1&&leaf">
+ <a-menu-item v-if="key!=-1&&leaf" v-has="'equipmentCategory:add&Edit&delete'">
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(entity.id)"
@@ -169,6 +169,7 @@
this.$refs.modalForm.title = "鏂板";
this.$refs.modalForm.disableSubmit = false;
this.$refs.modalForm.parentId = record.id;
+ this.$refs.modalForm.equipmentCategoryUda1 = record.equipmentCategoryUda1;
},
onClearSelected() {
this.hiding = true;
--
Gitblit v1.9.3