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/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue index 6ea783e..b721303 100644 --- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue +++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue @@ -102,7 +102,7 @@ span: 24 }, sm: { - span: 6 + span: 8 } }, wrapperCol: { @@ -110,7 +110,7 @@ span: 24 }, sm: { - span: 18 + span: 16 } }, labelColLong: { @@ -134,7 +134,7 @@ span: 24 }, sm: { - span: 3 + span: 4 } }, wrapperColLong1: { @@ -142,14 +142,28 @@ span: 24 }, sm: { - span: 21 + span: 20 } }, confirmLoading: false, form: this.$form.createForm(this), validatorRules: { + duration:{ + rules:[ + {required:true,message:'璇烽�夋嫨鏍囧噯鍔犲伐鏃堕棿'} + ] + }, + efficientDate:{ + rules:[ + {required:true,message:'璇烽�夋嫨鏃ユ湡'} + ] + }, + processQuantity:{ + rules:[ + {required:true,message:'璇烽�夋嫨鍔犲伐鏁伴噺'} + ] + }, }, - url: { add: '/mdc/mdcProcessQuantity/add', edit: '/mdc/mdcProcessQuantity/edit' @@ -274,11 +288,19 @@ } obj.then((res) => { if (res.success) { - that.$message.success("娣诲姞鎴愬姛") + // that.$message.success("娣诲姞鎴愬姛") + that.$notification.success({ + message:'娑堟伅', + description:"娣诲姞鎴愬姛" + }); // that.$message.success(res.message) that.$emit('ok', res.result) } else { - that.$message.warning(res.message) + // that.$message.warning(res.message) + that.$notification.warning({ + message:'娑堟伅', + description:res.message + }); } }).finally(() => { that.confirmLoading = false -- Gitblit v1.9.3