From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
index d89b2b2..ff78e6b 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
@@ -256,7 +256,11 @@
this.treeDataSource = res.result
this.generateList(res.result)
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -344,7 +348,11 @@
}
let ids = entity.id
if (!ids) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇烽�夋嫨涓�鏉¤褰�'
+ });
return
} else {
var that = this
@@ -355,10 +363,18 @@
that.loading = true
deleteAction(that.url.deleteBatch, { ids: ids }).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.queryTreeData();
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false
--
Gitblit v1.9.3