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/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue index e71c822..976f629 100644 --- a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue +++ b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue @@ -7,6 +7,7 @@ cancelText="鍏抽棴" @cancel="handleCancel" :confirmLoading="confirmLoading" + title="闄勫綍4" > <!-- :title="title" --> <a-spin :spinning="confirmLoading"> @@ -287,7 +288,6 @@ edit(record) { let that = this; - debugger if (record.receipts == "" || record.receipts == null) { this.getSysFileName() } @@ -322,6 +322,13 @@ const that = this; // 瑙﹀彂琛ㄥ崟楠岃瘉 + for (let i = 0; i < that.dataSource.length; i++) { + let o = that.dataSource[i] + if (o.firstInspect == "2" && o.secondInspect == "2") { + that.$message.warning("楠屾敹鍗曠" + (i + 1) + "琛岋紝涓ゆ妫�楠屽潎涓轰笉閫氳繃锛岃閲嶆柊妫�楠岃椤逛繚鍏诲唴瀹癸紒"); + return + } + } that.form.validateFields((err, values) => { if (!err) { this.$confirm({ -- Gitblit v1.9.3