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/mixins/JeecgListMixin.js |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index 841a3e7..b5986e5 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -358,11 +358,19 @@
               )
             })
           } else {
-            this.$message.success(info.file.response.message || `${info.file.name} 鏂囦欢涓婁紶鎴愬姛`)
+            // this.$message.success(info.file.response.message || `${info.file.name} 鏂囦欢涓婁紶鎴愬姛`)
+            this.$notification.success({
+              message:'娑堟伅',
+              description:info.file.response.message || `${info.file.name} 鏂囦欢涓婁紶鎴愬姛`
+            });
           }
           this.loadData()
         } else {
-          this.$message.error(`${info.file.name} ${info.file.response.message}.`);
+          // this.$message.error(`${info.file.name} ${info.file.response.message}.`);
+          this.$notification.error({
+            message:'娑堟伅',
+            description:`${info.file.name} ${info.file.response.message}.`
+          });
         }
       } else if (info.file.status === 'error') {
         this.loading = false;
@@ -384,7 +392,11 @@
             })
           }
         } else {
-          this.$message.error(`鏂囦欢涓婁紶澶辫触: ${info.file.msg} `);
+          // this.$message.error(`鏂囦欢涓婁紶澶辫触: ${info.file.msg} `);
+          this.$notification.error({
+            message:'娑堟伅',
+            description:`鏂囦欢涓婁紶澶辫触: ${info.file.msg} `
+          });
         }
       }
     },

--
Gitblit v1.9.3