From 5c3c3e76fa7a14dca40775d78bd7f6370142abed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 11 Jun 2022 18:57:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/index.js                     |  7 +++----
 src/utils/request.js                  |  8 ++++----
 src/views/index.vue                   |  7 -------
 src/views/system/commonLang/index.vue | 20 ++++++++++----------
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/i18n/index.js b/src/i18n/index.js
index 4358092..f03b3fe 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -41,7 +41,8 @@ const i18n = createI18n({
       ...en,
       ...pageLoginEn,
       ...pagemenuEn
-    }
+    },
+    //... 在这里添加其他语言支持
   }
 })
 
@@ -49,9 +50,7 @@ const loadLocale = () => {
   listLangByLocale(language.value).then(res => {
     const { code, data } = res
     if (code == 200) {
-      i18n.global.mergeLocaleMessage('zh-cn', data.cn)
-      i18n.global.mergeLocaleMessage('zh-tw', data.tw)
-      i18n.global.mergeLocaleMessage('en', data.en)
+      i18n.global.mergeLocaleMessage(language.value, data)
     }
   })
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index eb144ca..3d61019 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -41,9 +41,9 @@ service.interceptors.response.use(res => {
       return res.data
     }
     if (code == 401) {
-      ElMessageBox.confirm($t('login.loginTimeOut'), $t('common.systemTips'), {
-        confirmButtonText: $t('login.reLogin'),
-        cancelButtonText: $t('btn.cancel'),
+      ElMessageBox.confirm('登录状态已过期，请重新登录', '系统提示', {
+        confirmButtonText: '重新登陆',
+        cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         useUserStore().logOut().then(() => {
@@ -52,7 +52,7 @@ service.interceptors.response.use(res => {
         })
       })
 
-      return Promise.reject($t('login.invalidSession'))
+      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
     } else if (code == 0 || code == 1 || code == 110 || code == 101 || code == 403 || code == 500 || code == 429) {
       ElMessage({
         message: msg,
diff --git a/src/views/index.vue b/src/views/index.vue
index 788e944..0c092a1 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -132,13 +132,6 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="10">
-        <!-- <el-card>
-          <div slot="header" class="clearfix">
-            <span></span>
-          </div>
-        </el-card> -->
-      </el-col>
     </el-row>
   </div>
 </template>
diff --git a/src/views/system/commonLang/index.vue b/src/views/system/commonLang/index.vue
index ae3b3a9..b97de28 100644
--- a/src/views/system/commonLang/index.vue
+++ b/src/views/system/commonLang/index.vue
@@ -12,7 +12,7 @@
     <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
       <el-form-item :label="$t('language')" prop="langCode">
         <el-select v-model="queryParams.langCode" placeholder="请选择语言code">
-          <el-option v-for="item in sys_lang_type" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+          <el-option v-for="item in options.sys_lang_type" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('languageKey')" prop="langKey">
@@ -76,7 +76,7 @@
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center" />
 
-      <!-- <el-table-column prop="id" label="id" align="center" /> -->
+      <el-table-column prop="id" label="id" align="center" />
       <el-table-column prop="langCode" :label="$t('language')" align="center">
         <template #default="scope">
           <dict-tag :options="sys_lang_type" :value="scope.row.langCode" />
@@ -213,9 +213,16 @@ const state = reactive({
     langKey: [{ required: true, pattern: /^[A-Za-z].+$/, message: '语言key不能为空', trigger: 'change' }],
     langName: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
   },
+  options: {},
 })
 
-const { form, rules } = toRefs(state)
+var dictParams = [{ dictType: 'sys_lang_type' }]
+proxy.getDicts(dictParams).then((response) => {
+  response.data.forEach((element) => {
+    state.options[element.dictType] = element.list
+  })
+})
+const { form, rules, options } = toRefs(state)
 // 总记录数
 const total = ref(0)
 const dataList = ref([])
@@ -226,13 +233,6 @@ const sys_lang_type = ref([])
 // 添加时间时间范围
 const dateRangeAddtime = ref([])
 
-var dictParams = [{ dictType: 'sys_lang_type' }]
-
-proxy.getDicts(dictParams).then((response) => {
-  response.data.forEach((element) => {
-    proxy[element.dictType] = element.list
-  })
-})
 watch(
   () => queryParams.showMode,
   () => {