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/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue b/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue
index 4099d53..7e6f237 100644
--- a/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue
+++ b/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue
@@ -21,7 +21,7 @@
@initComp="initComp"/>
<span style="display: inline-block;height:100%;padding-left:14px" v-if="userIds" >
<span @click="openSelect" style="display: inline-block;vertical-align: middle">{{ userNames }}</span>
- <a-icon style="margin-left:5px;vertical-align: middle" type="close-circle" @click="handleEmpty" title="娓呯┖"/>
+ <a-icon v-if="!componentDisabled" style="margin-left:5px;vertical-align: middle" type="close-circle" @click="handleEmpty" title="娓呯┖"/>
</span>
</div>
@@ -119,6 +119,10 @@
},
methods: {
openSelect() {
+ // disabled 涓嶅脊绐�
+ if (this.componentDisabled) {
+ return
+ }
this.$refs.selectModal.showModal()
},
selectOK(rows, idstr) {
--
Gitblit v1.9.3