From da1837552fcce2cc7a7ed54e82aa559a88786db0 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 3 Mar 2022 16:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E5=AE=87=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/App.vue                               |  9 ---------
 jero-web/src/components/tools/UserMenu.vue         | 14 ++++++++------
 jero-web/src/views/system/UserAnnouncementList.vue |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue
index 68a7b2e6e..00dfec3bc 100644
--- a/jero-web/src/App.vue
+++ b/jero-web/src/App.vue
@@ -58,20 +58,11 @@
       // 自己配置多语言适配
       this.$root.Bus.$on('switchLanguage', value => {
         let router_path = this.$route.path
-        switch (value) {
-          case 'zh-cn':
-            localStorage.setItem('language', 'zh-cn')
-            break
-          case 'en-us':
-            localStorage.setItem('language', 'en-us')
-            break
-        }
         this.isRouterAlive = false //先关闭，
         // 刷新页面
         this.$nextTick(function() {
           this.isRouterAlive = true //再打开
         })
-
         // 系统组件适配
         let lang = localStorage.language
         if (lang == 'zh-cn') {
diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index 541cb0143..03dae11a2 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -292,6 +292,14 @@
       moment,
       changeLocale(localeval) {
         this.isLoading = true
+        switch (localeval) {
+          case 'zh-cn':
+            localStorage.setItem('language', 'zh-cn')
+            break
+          case 'en-us':
+            localStorage.setItem('language', 'en-us')
+            break
+        }
         store.dispatch('GetPermissionList').then(res => {
           this.$root.Bus.$emit('switchLanguage', localeval)
           this.isLoading = false
@@ -301,17 +309,11 @@
             this.$i18n.locale = EN
             this.locale = enUS
             this.queryAllDictItemsByCut()
-            this.GetPermissionList()
-            // localStorage.setItem('language', EN)
-            // location.reload();
           } else {
             moment.locale(ZH)
             this.$i18n.locale = ZH
             this.locale = zhCN
             this.queryAllDictItemsByCut()
-            this.GetPermissionList()
-            // localStorage.setItem('language', ZH)
-            // location.reload();
           }
         })
       }
diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index f5ecf5bac..ea9a84f93 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -127,7 +127,7 @@
           list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
           editCementSend: 'sys/sysAnnouncementSend/editByAnntIdAndUserId',
           readAllMsg: 'sys/sysAnnouncementSend/read',
-          deleteUrl: ''
+          deleteUrl: 'sys/sysAnnouncementSend/deleteBatch'
         },
         loading: false,
         openPath: '',