From 49a74a67140e814bb70efcde61b37d4750448e6a Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 14 五月 2024 16:39:01 +0800
Subject: [PATCH] 1、设备加工工件报表页面调整表格唯一标识字段由equipmentId调整为id以试图解决项目服务器上表格数据混乱问题 2、设备利用率、设备开动率、班次利用率以及设备综合效率分析页面调整设备类型、驱动类型、设备级别以及设备种类页面组件为多选下拉菜单
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue
index 04db0bc..e1ac1e5 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue
@@ -275,11 +275,19 @@
let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
let dataStart = stertDate.replace(/:/g,'');
if(startOne < dataStart) {
- that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ // that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�"
+ });
that.confirmLoading = false
}else{
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
+ });
// console.log(this.model)
// this.endTime = ''
that.confirmLoading = false
@@ -294,11 +302,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