diff --git a/src/lang/en.js b/src/lang/en.js
index 3831531..1ccec7e 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -2,7 +2,8 @@ export default {
   system: {
     title: 'HXHQ',
     tip: 'prompt',
-    logOut: 'Are you sure to log out and exit the system?'
+    logOut: 'Are you sure to log out and exit the system?',
+    crowdOut: '该账户已在其他地方登录，是否继续登录，继续登录挤掉原登录账号'
   },
   form: {
     search: 'search',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 467804c..01ec480 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -2,7 +2,8 @@ export default {
   system: {
     title: '华西海圻管理系统',
     tip: '提示',
-    logOut: '确认注销并退出系统吗？'
+    logOut: '确认注销并退出系统吗？',
+    crowdOut: '该账户已在其他地方登录，是否继续登录，继续登录挤掉原登录账号'
   },
   form: {
     search: '查询',
diff --git a/src/utils/request.js b/src/utils/request.js
index a7c724d..9738f01 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -129,7 +129,9 @@ service.interceptors.response.use(
       }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
     } else if (code === 500) {
-      Message({ message: msg, type: 'error' })
+      if (msg !== 'exists') {
+        Message({ message: msg, type: 'error' })
+      }
       return Promise.reject(new Error(msg))
     } else if (code === 601) {
       Message({ message: msg, type: 'warning' })
diff --git a/src/views/login.vue b/src/views/login.vue
index e005ad6..796308e 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -78,8 +78,8 @@ export default {
       footerContent: defaultSettings.footerContent,
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: "",
@@ -152,9 +152,23 @@ export default {
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
           }).catch(err => {
             if(err && err.message==='exists'){
-
+              this.$confirm(this.$t('system.crowdOut'), this.$t('system.tip'), {
+                confirmButtonText: this.$t('form.confirm'),
+                cancelButtonText: this.$t('form.cancel'),
+                type: 'warning'
+              }).then(() => {
+                this.loginForm.force = true
+                this.handleLogin()
+              }).catch(() => {
+                this.loading = false;
+                this.loginForm.force = false
+                if (this.captchaEnabled) {
+                  this.getCode();
+                }
+              })
             }else{
               this.loading = false;
+              this.loginForm.force = false
               if (this.captchaEnabled) {
                 this.getCode();
               }