From 237b5f107cf9fab2a6b730f1a036dbdcbfb63498 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 27 十一月 2023 15:45:08 +0800
Subject: [PATCH] 1、车间看板页面非全屏模式下使图纸盒子占满底部，而不是被屏幕任务栏遮盖 2、报警分析页面调整右侧表格以及图表布局，调整表格合计持续字段展示格式为时分秒 3.大屏车间管理页面选择已有设备窗口弹出方式由模态窗改为右侧抽屉
---
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
index fd2c967..538504e 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
@@ -136,6 +136,30 @@
},
],
},
+ noplanType:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨绫诲瀷"
+ },
+ ],
+ },
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨缁撴潫鏃堕棿"
+ },
+ ],
+ },
// mdcRepairType:{
// rules:[
// {
@@ -260,7 +284,12 @@
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
@@ -275,11 +304,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