From ec68cffd70d2a2788f7c74af55a11563aaf611d1 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期三, 06 十二月 2023 15:47:38 +0800 Subject: [PATCH] 1、登录页面优化首次登录会出现404字样,需要明确用户登录后显示页面是否为首页/消息页或者角色中可设置 2、驱动参数管理页面新增或修改控制系统中英文名称规则限制字符数最少6位调整为2位 3、效率段管理页面效率段颜色可自定义 4、设备利用率、设备开动率、班次利用率页面增加可按照设备类型筛选查询 5、对比分析页面增加通过选择设备来对比 6、设备日利用率和设备日利用率对比页面优化选择树节点后查询区域的设备名称字段不会更新问题 --- src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue index fef87aa..2a2ffdb 100644 --- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue +++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue @@ -35,9 +35,11 @@ </a-col> </a-row> <a-row :gutter="24"> + <a-col :span="24"> <a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong"> - <a-textarea :disabled="disableSubmit" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea> + <a-textarea :maxLength="20" :disabled="disableSubmit" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea> </a-form-item> + </a-col> </a-row> </a-form> </a-spin> @@ -115,6 +117,30 @@ { required:true, message: "璇烽�夋嫨璁惧" + }, + ], + }, + noplanType:{ + rules:[ + { + required:true, + message: "璇烽�夋嫨绫诲瀷" + }, + ], + }, + startTime:{ + rules:[ + { + required:true, + message: "璇烽�夋嫨寮�濮嬫椂闂�" + }, + ], + }, + endTime:{ + rules:[ + { + required:true, + message: "璇烽�夋嫨缁撴潫鏃堕棿" }, ], }, @@ -231,7 +257,11 @@ let startOne = start.replace(/:/g,''); let endOne = end.replace(/:/g,''); if(startOne>=endOne){ - that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"); + // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"); + that.$notification.warning({ + message:'娑堟伅', + description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�" + }); // console.log(this.model) // this.endTime = '' that.confirmLoading = false @@ -246,11 +276,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