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/DeviceCalendarAddTree.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue
index 2d6e8f6..fb238f0 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue
@@ -104,7 +104,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
@@ -189,16 +193,23 @@
lastpermissionIds:that.defaultCheckedKeys.join(","),
};
that.loading = true;
- console.log("璇锋眰鍙傛暟锛�",params);
saveRolePermission(params).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loading = false;
if (exit) {
that.close()
}
}else {
- that.$message.error(res.message);
+ // that.$message.error(res.message);
+ that.$notification.error({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loading = false;
if (exit) {
that.close()
@@ -215,7 +226,6 @@
this.checkedKeys = [...res.result];
this.defaultCheckedKeys = [...res.result];
this.expandedKeysss = this.allTreeKeys;
- console.log(this.defaultCheckedKeys)
})
})
}
--
Gitblit v1.9.3