From 43102c94c446bdb2272f56c563120ca16131e8db Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Mon, 27 Mar 2023 11:11:00 +0800
Subject: [PATCH] =?UTF-8?q?CN:936=20fix=EF=BC=9A=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E3=80=81=E7=9F=A5=E8=AF=86=E5=BA=93=E3=80=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=82=B9=E5=87=BB=E5=88=A0=E9=99=A4=E6=88=96?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=B3?=
 =?UTF-8?q?=E4=B8=8A=E8=A7=92X=E5=8F=8Acancel=EF=BC=8C=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/report/ReportTable.vue |  2 +-
 src/mixins/data-list.js                     |  8 ++++----
 src/views/administration/Roles.vue          | 10 +++++-----
 src/views/report/Report.vue                 |  2 +-
 src/views/setting/KnowledgeBase.vue         |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/table/report/ReportTable.vue b/src/components/table/report/ReportTable.vue
index 2be79dae..9d70e5e0 100644
--- a/src/components/table/report/ReportTable.vue
+++ b/src/components/table/report/ReportTable.vue
@@ -660,7 +660,7 @@ export default {
             this.$message.error(response.msg)
           }
         })
-      })
+      }).catch(() => {})
     },
     pageJump (val) {
       this.pageObj.pageNo = val
diff --git a/src/mixins/data-list.js b/src/mixins/data-list.js
index cf71e37d..7ff6eced 100644
--- a/src/mixins/data-list.js
+++ b/src/mixins/data-list.js
@@ -126,7 +126,7 @@ export default {
             this.$message.error(response.msg)
           }
         })
-      })
+      }).catch(e => {})
     },
     delBatch () {
       const ids = []
@@ -139,7 +139,7 @@ export default {
         this.$alert(this.$t('tip.pleaseSelect'), {
           confirmButtonText: this.$t('tip.yes'),
           type: 'warning'
-        })
+        }).catch(() => {})
       } else {
         this.$confirm(this.$t('tip.confirmDelete'), {
           confirmButtonText: this.$t('tip.yes'),
@@ -158,7 +158,7 @@ export default {
           }).finally(() => {
             this.tools.loading = false
           })
-        })
+        }).catch(() => {})
       }
     },
     newObject () {
@@ -204,7 +204,7 @@ export default {
         this.$alert(this.$t('tip.pleaseSelectForEdit'), {
           confirmButtonText: this.$t('tip.yes'),
           type: 'warning'
-        })
+        }).catch(() => {})
       } else {
         get(`${this.url}/${this.batchDeleteObjs[0].id}`).then(response => {
           if (response.code === 200) {
diff --git a/src/views/administration/Roles.vue b/src/views/administration/Roles.vue
index 6738ae34..b01fd88b 100644
--- a/src/views/administration/Roles.vue
+++ b/src/views/administration/Roles.vue
@@ -91,12 +91,12 @@ export default {
   },
   methods: {
     edit () {
-      if(this.batchDeleteObjs.length === 0){
-        this.$alert(this.$t('tip.pleaseSelectForEdit'),{
+      if (this.batchDeleteObjs.length === 0) {
+        this.$alert(this.$t('tip.pleaseSelectForEdit'), {
           confirmButtonText: this.$t('tip.yes'),
-          type:'warning'
-        })
-      }else {
+          type: 'warning'
+        }).catch(() => {})
+      } else {
         get(`${this.url}`, { ids: this.batchDeleteObjs[0].id }).then(response => {
           if (response.code === 200) {
             this.object = response.data.list[0]
diff --git a/src/views/report/Report.vue b/src/views/report/Report.vue
index a6ef3f93..13c6e71c 100644
--- a/src/views/report/Report.vue
+++ b/src/views/report/Report.vue
@@ -299,7 +299,7 @@ export default {
         this.$alert(this.$t('tip.pleaseSelectForEdit'), {
           confirmButtonText: this.$t('tip.yes'),
           type: 'warning'
-        })
+        }).catch(() => {})
       } else {
         const curRecord = this.batchDeleteObjs[0]
         this.initConfig(curRecord)
diff --git a/src/views/setting/KnowledgeBase.vue b/src/views/setting/KnowledgeBase.vue
index 1ba08c0b..1439987d 100644
--- a/src/views/setting/KnowledgeBase.vue
+++ b/src/views/setting/KnowledgeBase.vue
@@ -92,7 +92,7 @@ export default {
         this.$alert(this.$t('tip.pleaseSelectForEdit'), {
           confirmButtonText: this.$t('tip.yes'),
           type: 'warning'
-        })
+        }).catch(() => {})
       } else {
         this.jumpToEditPage(this.batchDeleteObjs[0].id)
       }
@@ -122,7 +122,7 @@ export default {
         }).finally(() => {
           this.tools.loading = false
         })
-      })
+      }).catch(() => {})
     },
     jumpToEditPage (id) {
       this.$router.push({