Merge branch 'internationalization' into testToMerge

src/components/newLayout/modules/header.vue

@@ -216,7 +216,6 @@ export default {
       });
     },
     loginOut() {
-      let lang = localStorage.getItem("lang");
       this.$confirm(this.$t("是否要退出当前账号") + "?", this.$t("提示"), {
         confirmButtonText: this.$t("确定"),
         cancelButtonText: this.$t("取消"),
@@ -224,7 +223,6 @@ export default {
       })
         .then(() => {
           sessionStorage.clear();
-          localStorage.setItem("lang", lang);
           this.$router.push("/");
           location.reload();
         })
@@ -284,6 +282,7 @@ export default {
       this.languagename =
         this.langusge.find((v) => v.languagecode == this.nowType)
           .languagename || "简体中文";
+      localStorage.setItem("languagename", this.languagename);
       this.editorChangeLanguage();
     },
     async changeLanguage(type) {
@@ -291,6 +290,7 @@ export default {
       this.languagename =
         this.langusge.find((v) => v.languagecode == this.nowType)
           .languagename || "简体中文";
+      localStorage.setItem("languagename", this.languagename);
       localStorage.setItem("lang", type);
       this.$nextTick(() => {
         this.$i18n.locale = type;
@@ -347,6 +347,12 @@ export default {
     this.siteInfos();
     this.languagelist();
 
+    try {
+      this.languagename = localStorage.getItem("languagename") || "简体中文";
+    } catch (error) {
+      this.languagename = "简体中文";
+    }
+    
     this.accountInfo = JSON.parse(sessionStorage.getItem("active_account"));
     this.accountList = JSON.parse(
       sessionStorage.getItem("account_list")

src/components/newLayout/modules/headercopynew.vue

@@ -161,12 +161,6 @@ export default {
     changeAccount () {
       this.$router.push('/accounts')
     },
-    handleCommand (command) {
-      localStorage.setItem('lang',command)
-      this.basicData.query_userauth().then(()=>{
-              this.$router.go(0)
-      })
-
     },
     //跳转到应用,并设设置激活模块
     handelMenuAppClick (app,type) {

src/utils/i18n.js

@@ -37,7 +37,7 @@ api.requested({
 })
 // 准备翻译的语言环境信息
 const i18n = new VueI18n({
-    locale: localStorage.getItem('lang') || "EN", //将语言标识存入localStorage或sessionStorage中，页面刷新不会默认中文显示
+    locale: localStorage.getItem('lang') || "ZH", //将语言标识存入localStorage或sessionStorage中，页面刷新不会默认中文显示
     messages,
     silentTranslationWarn: true, //解决vue-i18n黄色警告"value of key 'xxx' is not a string"和"cannot translate the value of keypath 'xxx'.use the value of keypath as default",可忽略
     globalInjection: true, // 全局注入

src/views/login/login.vue

@@ -174,6 +174,11 @@ export default {
       this.checked = true;
     }
     this.languagelist();
+    try {
+      this.languagename = localStorage.getItem("languagename") || "简体中文";
+    } catch (error) {
+      this.languagename = "简体中文";
+    }
     /*this.qusetLanguage();*/
   },
   methods: {
@@ -352,6 +357,7 @@ export default {
       this.languagename =
         this.langusge.find((v) => v.languagecode == this.nowType)
           .languagename || "简体中文";
+      localStorage.setItem("languagename", this.languagename);
     },
     async i18nChangeLanguage(type) {
       this.nowType = type;
@@ -363,6 +369,7 @@ export default {
       this.languagename =
         this.langusge.find((v) => v.languagecode == this.nowType)
           .languagename || "简体中文";
+      localStorage.setItem("languagename", this.languagename);
     },
   },
 };