From b70dab217e5ebcab6d98196cc2d4b2ffb842c3a1 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期日, 08 十月 2023 17:33:34 +0800 Subject: [PATCH] 1、优化车间看板四色灯状态展示以及限制拖拽区域 2、部分页面右侧区域元素位置离顶过高,调整布局 3、增加设备日志页面增加点击表格行数据展示当前行工作曲线功能 4、优化设备日志页面切换时间,工作曲线弹窗中的时间随之切换 5、优化设备日志页面加载后首次点击工作曲线后无法查询到数据问题(同时发送异步请求,先后顺序影响) --- src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue index e311dc5..2a2ffdb 100644 --- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue +++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue @@ -120,6 +120,30 @@ }, ], }, + noplanType:{ + rules:[ + { + required:true, + message: "璇烽�夋嫨绫诲瀷" + }, + ], + }, + startTime:{ + rules:[ + { + required:true, + message: "璇烽�夋嫨寮�濮嬫椂闂�" + }, + ], + }, + endTime:{ + rules:[ + { + required:true, + message: "璇烽�夋嫨缁撴潫鏃堕棿" + }, + ], + }, }, url: { @@ -233,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 @@ -248,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