diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index 12a26fe..bb66a14 100644
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@@ -37,7 +37,6 @@
           <div class="key" @click="clearPin">重输</div>
           <div class="key" @click="inputPin('0')">0</div>
           <div class="key" @click="submitPin">确定</div>
-          <div class="key" @click="reloadUser">刷新</div>
         </div>
       </div>
     </main>
@@ -46,21 +45,19 @@
 
 <script setup lang="ts">
 import { onMounted, onUnmounted, ref, watch } from 'vue'
-import { login, getUserList } from '../../services/index'
-import { isBoardParamInited } from '../../services/Index/init'
-import type { User } from '../../types/Index'
+import { login, getUserList } from '@/services'
+import { isBoardParamInited } from '@/services'
+import type { User } from '@/types/Index'
 import { useRouter } from 'vue-router'
 import { getServerInfo } from '@/utils/getServerInfo'
 import { createWebSocket, DeviceContextStateMessage } from '@/websocket/socket'
-import message from 'element-plus/es/components/message/index.mjs'
+import { ElMessage } from 'element-plus'
+
 const router = useRouter()
 
 const stateUrl = getServerInfo('/api/v1/app/ws/state')
 const wsState = createWebSocket(stateUrl.wsUrl)
 
-// 用户角色
-// const roles = ref(['护士', '管理员', '测试人员'])
-// const selectedRole = ref('护士')
 //用户列表
 const userList = ref<User[]>([])
 //获取用户列表
@@ -68,6 +65,7 @@ const getUserListData = async () => {
   const res = await getUserList()
   userList.value = res.data
 }
+
 const handleDeviceContextState = (data: DeviceContextStateMessage['data']) => {
   if (data.loginFlag) {
     sessionStorage.setItem('token', JSON.stringify(data.loginUser))
@@ -91,9 +89,6 @@ onUnmounted(() => {
     handleDeviceContextState,
   )
 })
-const reloadUser = () =>{
-  getUserListData()
-}
 //选中的用户
 const selectedUser = ref<User | null>(null)
 // PIN 相关
@@ -132,31 +127,31 @@ const clearPin = () => {
 // 点击确认验证PIN码
 // 模拟后端请求验证PIN
 const submitPin = async () => {
-  let resData = await isBoardParamInited()
-  if(!resData.data){//设备正在初始化
-    message.warning('设备正在初始化，请稍候...')
-    return;
-  }
   if (selectedUser.value === null) {
     loginStatus.value = '请选择用户'
     return
-  } else if (pin.value.length !== maxPinLength) {
+  }
+  if (pin.value.length !== maxPinLength) {
     loginStatus.value = '请输入密码'
     return
   }
+  let resData = await isBoardParamInited()
+  if (!resData.data) {
+    //设备正在初始化
+    ElMessage.warning('设备正在初始化，请稍候...')
+    return
+  }
   const params = {
-    // account: selectedUser.value?.account,
     id: selectedUser.value?.id,
     password: pin.value,
   }
   const res = await login(params)
-  console.log(res)
   if (res.success) {
     loginStatus.value = '登录成功'
     sessionStorage.setItem('token', JSON.stringify(res.data))
-    router.push('/index')
+    await router.push('/index')
   } else {
-    loginStatus.value = `${res.info}`
+    loginStatus.value = res.info
     pin.value = ''
   }
 }