diff --git a/src/main.js b/src/main.js index a70c2d40..6b02b1f0 100644 --- a/src/main.js +++ b/src/main.js @@ -353,12 +353,14 @@ async function VueInit() { return } _vm.$store.dispatch('user/logout').then(res => { - window.location.href = `/login` + // window.location.href = `/login` + router.push("/login") + }).then(()=>{ + _vm.$alert(lang === 'zh' ? '由于您长时间未操作,为保护您的数据安全已强制将您下线,如果需要继续操作请重新登陆!' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', { + type: 'warning', + }) }) - _vm.$alert(lang === 'zh' ? '由于您长时间未操作,为保护您的数据安全已强制将您下线,如果需要继续操作请重新登陆!' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', { - type: 'warning', - }) } : () => { }, process.env.VUE_APP_LOGOUT_FOR_TIME, eval(process.env.VUE_APP_LOCK_FOR_PERMISSION) ? () => { var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh' diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue index 8afaf56b..360c4fc5 100644 --- a/src/views/trials/trials-list/components/TrialForm.vue +++ b/src/views/trials/trials-list/components/TrialForm.vue @@ -12,29 +12,58 @@ > - + - - - {{ item.label }} + + + {{ item.label }} - - + + - + - + @@ -45,9 +74,18 @@ - + - + - + - + @@ -100,8 +155,14 @@ - - + + - + - + - + - + @@ -166,9 +241,12 @@ - + - @@ -193,14 +271,19 @@ - + - - - + - + - - + @@ -229,106 +318,96 @@ multiple clearable > - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - {{ $t('trials:trials-list:form:cancel') }} + {{ $t("trials:trials-list:form:cancel") }} - {{ $t('trials:trials-list:form:save') }} + {{ $t("trials:trials-list:form:save") }}