From e91ea94c5e06bd183c65999b49c7852205e1ac64 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 20 九月 2023 17:42:55 +0800
Subject: [PATCH] 1、工作日历管理页面增加表格单条数据删除功能 2、报警号管理页面与对比分析页面中的驱动类型数据不再使用数据字典，而采用调用接口获取数据方式 3、报警号管理页面的新增与编辑弹窗中的是否过滤选项切换器优化

---
 src/mixins/JeecgListMixin.js |   46 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index eb70391..9f078b6 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -139,7 +139,6 @@
           return false;
         }
       }
-
       return filterObj(param);
     },
     getQueryField() {
@@ -150,7 +149,6 @@
       });
       return str;
     },
-
     onSelectChange(selectedRowKeys, selectionRows) {
       this.selectedRowKeys = selectedRowKeys;
       this.selectionRows = selectionRows;
@@ -175,7 +173,11 @@
         return
       }
       if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+        // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+        this.$notification.warning({
+          message:'娑堟伅',
+          description:"璇烽�夋嫨涓�鏉¤褰�"
+        });
         return;
       } else {
         var ids = "";
@@ -192,11 +194,19 @@
               if (res.success) {
                 //閲嶆柊璁＄畻鍒嗛〉闂
                 that.reCalculatePage(that.selectedRowKeys.length)
-                that.$message.success(res.message);
+                // that.$message.success(res.message);
+                that.$notification.success({
+                  message:'娑堟伅',
+                  description:res.message
+                });
                 that.loadData();
                 that.onClearSelected();
               } else {
-                that.$message.warning(res.message);
+                // that.$message.warning(res.message);
+                that.$notification.warning({
+                  message:'娑堟伅',
+                  description:res.message
+                });
               }
             }).finally(() => {
               that.loading = false;
@@ -215,10 +225,18 @@
         if (res.success) {
           //閲嶆柊璁＄畻鍒嗛〉闂
           that.reCalculatePage(1)
-          that.$message.success(res.message);
+          // that.$message.success(res.message);
+          that.$notification.success({
+            message:'娑堟伅',
+            description:res.message
+          });
           that.loadData();
         } else {
-          that.$message.warning(res.message);
+          // that.$message.warning(res.message);
+          that.$notification.warning({
+            message:'娑堟伅',
+            description:res.message
+          });
         }
       });
     },
@@ -267,10 +285,18 @@
       //娓呯┖鍒楄〃閫変腑
       this.onClearSelected()
     },
+    /**
+     * 鐐瑰嚮琛ㄦ牸涓鎯呮寜閽簨浠�
+     * @param record 閫変腑鐨勫綋鍓嶈鏁版嵁
+     */
     handleDetail:function(record){
       this.$refs.modalForm.edit(record);
       this.$refs.modalForm.title="璇︽儏";
       this.$refs.modalForm.disableSubmit = true;
+      // 鎵撳紑璇︽儏鎶藉眽鏃剁鐢ㄨ澶囩紪鐮併�佽澶囧悕绉拌緭鍏ユ
+      this.$refs.modalForm.disSeach = true;
+      // 璋冪敤鎶藉眽琛ㄥ崟缁勪欢涓殑娓呴櫎琛ㄥ崟楠岃瘉鏂规硶
+      this.$refs.modalForm.removeValidate()
     },
     /* 瀵煎嚭 */
     handleExportXls2(){
@@ -289,7 +315,11 @@
       console.log("瀵煎嚭鍙傛暟",param)
       downFile(this.url.exportXlsUrl,param).then((data)=>{
         if (!data) {
-          this.$message.warning("鏂囦欢涓嬭浇澶辫触")
+          // this.$message.warning("鏂囦欢涓嬭浇澶辫触")
+          this.$notification.warning({
+            message:'娑堟伅',
+            description:"鏂囦欢涓嬭浇澶辫触"
+          });
           return
         }
         if (typeof window.navigator.msSaveBlob !== 'undefined') {

--
Gitblit v1.9.3