From 148129851fbdb97b31a7a3808edb85e6844aef27 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Sun, 20 Apr 2025 22:24:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E5=86=97=E4=BD=99?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Login/Login.vue | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index cb8a85f..1a5e5ea 100644
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@@ -46,21 +46,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 +66,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))
@@ -132,11 +131,11 @@ const clearPin = () => {
 // 点击确认验证PIN码
 // 模拟后端请求验证PIN
 const submitPin = async () => {
-  // let resData = await isBoardParamInited()
-  // if(!resData.data){//设备正在初始化
-  //   message.warning('设备正在初始化，请稍候...')
-  //   return;
-  // }
+  let resData = await isBoardParamInited()
+  if(!resData.data){//设备正在初始化
+    ElMessage.warning('设备正在初始化，请稍候...')
+    return;
+  }
   if (selectedUser.value === null) {
     loginStatus.value = '请选择用户'
     return
@@ -145,18 +144,16 @@ const submitPin = async () => {
     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 = ''
   }
 }