From 51b9e548b0e533e8a415ce141808f2bb747b381e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 18 三月 2024 16:08:49 +0800
Subject: [PATCH] 1、mdc菜单下除特殊要求外,页面表格最少条数由10条调整为30条,每页最多条数区间由[10,20,30]调整为[30,50,100] 2、OEE基础管理和数据报表模块增加打印按钮,实现打印表格数据功能 3、设备管理、数据报表模块增加按照设备级别和设备类型查询表格数据 4、设备车间管理页面增加车间编码字段 5、修改组件名称以试图解决刷新后进入请求json页面问题

---
 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