From 8fb3f232179f8fc1ca75a89ee5075d3ce688b9f9 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 2 Jun 2022 17:35:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/globalAdvancedQuery/index.vue  | 11 +++++
 jero-web/src/components/tools/UserMenu.vue    | 49 +++++++++----------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue
index 9610dcba9..cf249be8a 100644
--- a/jero-web/src/components/globalAdvancedQuery/index.vue
+++ b/jero-web/src/components/globalAdvancedQuery/index.vue
@@ -103,6 +103,17 @@
               <a-col :md="8" :xs="24" style="margin-bottom: 12px;">
                 <!-- 下拉搜索 -->
                 <j-search-select-tag v-if="item.type==='sel_search'" v-model="item.val" :dict="getDictInfo(item)" placeholder="请选择"/>
+                <a-tree-select
+                  v-else-if="item.type==='tree'"
+                  tree-node-filter-prop="title"
+                  v-model="item.val"
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  style="width: 100%"
+                  :tree-data="item.tree"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')"
+                />
                 <!-- 下拉多选 -->
                 <template v-else-if="item.type==='list_multi'">
                   <j-multi-select-tag v-if="item.options" v-model="item.val" :options="item.options" :placeholder="$t('pleaseSelect')"/>
diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index 2176ae447..12a0a75f2 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -291,13 +291,6 @@
           console.log('刷新失败', e)
         })
       },
-      queryAllDictItemsByCut() {
-        getAction('/sys/dict/queryAllDictItemsByCut', {}).then((res) => {
-          if (res.success) {
-            Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
-          }
-        })
-      },
       /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
       moment,
       changeLocale(localeval) {
@@ -310,25 +303,29 @@
             localStorage.setItem('language', 'en-us')
             break
         }
-        store.dispatch('GetPermissionList').then(res => {
-          const menuData = res.result.menu
-          resetRouter()
-          let constRoutes = []
-          constRoutes = generateIndexRouter(menuData)
-          router.addRoutes(constRoutes)
-          this.$root.Bus.$emit('switchLanguage', localeval)
-          this.isLoading = false
-          this.localeval = localeval
-          if (localeval === EN) {
-            moment.locale(EN)
-            this.$i18n.locale = EN
-            this.locale = enUS
-            this.queryAllDictItemsByCut()
-          } else {
-            moment.locale(ZH)
-            this.$i18n.locale = ZH
-            this.locale = zhCN
-            this.queryAllDictItemsByCut()
+        getAction('/sys/dict/queryAllDictItemsByCut', {}).then((res) => {
+          if (res.success) {
+            Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
+            Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
+            store.dispatch('GetPermissionList').then(res => {
+              const menuData = res.result.menu
+              resetRouter()
+              let constRoutes = []
+              constRoutes = generateIndexRouter(menuData)
+              router.addRoutes(constRoutes)
+              this.$root.Bus.$emit('switchLanguage', localeval)
+              this.isLoading = false
+              this.localeval = localeval
+              if (localeval === EN) {
+                moment.locale(EN)
+                this.$i18n.locale = EN
+                this.locale = enUS
+              } else {
+                moment.locale(ZH)
+                this.$i18n.locale = ZH
+                this.locale = zhCN
+              }
+            })
           }
         })
       }