test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/metersphere/server into dev

This commit is contained in:
chenjianxing 2020-06-01 13:43:10 +08:00
parent 6035750d74 df8984d7ca
commit 903c81c93b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/business/components/common/head/LanguageSwitch.vue
View File

@ -44,6 +44,7 @@
}, },
methods: { methods: {
checkLanguage(lang) { checkLanguage(lang) {
if (!lang) return;
this.$setLang(lang); this.$setLang(lang);
switch (lang) { switch (lang) {
case ZH_CN: case ZH_CN:

6
frontend/src/common/js/ajax.js
View File

@ -14,12 +14,12 @@ export default {
} }
let login = function () { let login = function () {
MessageBox.alert(this.$t('commons.tips'), { MessageBox.alert("The authentication information has expired, please login again", "Prompt", {
callback: () => { callback: () => {
window.location.href = "/login" window.location.href = "/login"
} }
}).then(r => { }).then(r => {
window.location.href = "/login"
}); });
}; };
@ -53,7 +53,7 @@ export default {
} }
result.loading = false; result.loading = false;
window.console.error(error.response || error.message); window.console.error(error.response || error.message);
if (error.response.data) { if (!error.response.data) {
Message.error({message: error.response.data.message, showClose: true}); Message.error({message: error.response.data.message, showClose: true});
} else { } else {
Message.error({message: error.message, showClose: true}); Message.error({message: error.message, showClose: true});