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/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue
index 8569e07..d489128 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue
@@ -19,6 +19,7 @@
@click="handleAdd"
type="primary"
icon="plus"
+ :disabled="buttonDistable"
>鏂板</a-button>
<a-table
ref="table"
@@ -43,7 +44,10 @@
slot="action"
slot-scope="text, record"
>
- <a @click="handleEdit(record)">缂栬緫</a>
+ <a
+ :disabled="buttonDistable"
+ @click="handleEdit(record)"
+ >缂栬緫</a>
<a-divider type="vertical" />
<Tooltip
@@ -66,6 +70,7 @@
v-if="record.upload.path && record.upload.format.toLowerCase()=='pdf'"
href="javascript:;"
@click="view(record)"
+ :disabled="buttonDistable"
>
棰勮
</a>
@@ -78,6 +83,7 @@
<a
href="javascript:;"
@click="handleDownload(record)"
+ :disabled="buttonDistable"
>涓嬭浇</a>
<a-divider type="vertical" />
@@ -85,7 +91,7 @@
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
>
- <a>鍒犻櫎</a>
+ <a :disabled="buttonDistable">鍒犻櫎</a>
</a-popconfirm>
</span>
@@ -133,6 +139,11 @@
calibrationOrderId: {
type: String,
default: '-1',
+ required: false
+ },
+ buttonDistable: {
+ type: Boolean,
+ default: 'false',
required: false
}
},
@@ -188,7 +199,7 @@
{
title: '鍒ゅ畾缁撴灉',
align: 'center',
- dataIndex: 'judgmentResultName'
+ dataIndex: 'judgmentResult_dicText'
},
{
title: '鎿嶄綔',
--
Gitblit v1.9.3