Browse Source

fix: 登录冗余代码修复

master
guoapeng 4 months ago
parent
commit
148129851f
  1. 29
      src/pages/Login/Login.vue

29
src/pages/Login/Login.vue

@ -46,21 +46,19 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, onUnmounted, ref, watch } from 'vue' 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 { useRouter } from 'vue-router'
import { getServerInfo } from '@/utils/getServerInfo' import { getServerInfo } from '@/utils/getServerInfo'
import { createWebSocket, DeviceContextStateMessage } from '@/websocket/socket' 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 router = useRouter()
const stateUrl = getServerInfo('/api/v1/app/ws/state') const stateUrl = getServerInfo('/api/v1/app/ws/state')
const wsState = createWebSocket(stateUrl.wsUrl) const wsState = createWebSocket(stateUrl.wsUrl)
//
// const roles = ref(['', '', ''])
// const selectedRole = ref('')
// //
const userList = ref<User[]>([]) const userList = ref<User[]>([])
// //
@ -68,6 +66,7 @@ const getUserListData = async () => {
const res = await getUserList() const res = await getUserList()
userList.value = res.data userList.value = res.data
} }
const handleDeviceContextState = (data: DeviceContextStateMessage['data']) => { const handleDeviceContextState = (data: DeviceContextStateMessage['data']) => {
if (data.loginFlag) { if (data.loginFlag) {
sessionStorage.setItem('token', JSON.stringify(data.loginUser)) sessionStorage.setItem('token', JSON.stringify(data.loginUser))
@ -132,11 +131,11 @@ const clearPin = () => {
// PIN // PIN
// PIN // PIN
const submitPin = async () => { 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) { if (selectedUser.value === null) {
loginStatus.value = '请选择用户' loginStatus.value = '请选择用户'
return return
@ -145,18 +144,16 @@ const submitPin = async () => {
return return
} }
const params = { const params = {
// account: selectedUser.value?.account,
id: selectedUser.value?.id, id: selectedUser.value?.id,
password: pin.value, password: pin.value,
} }
const res = await login(params) const res = await login(params)
console.log(res)
if (res.success) { if (res.success) {
loginStatus.value = '登录成功' loginStatus.value = '登录成功'
sessionStorage.setItem('token', JSON.stringify(res.data)) sessionStorage.setItem('token', JSON.stringify(res.data))
router.push('/index')
await router.push('/index')
} else { } else {
loginStatus.value = `${res.info}`
loginStatus.value = res.info
pin.value = '' pin.value = ''
} }
} }

Loading…
Cancel
Save