diff --git a/src/http/request.js b/src/http/request.js index d177db1..9aea61c 100644 --- a/src/http/request.js +++ b/src/http/request.js @@ -8,6 +8,7 @@ import { encrypt, decrypt } from '@/utils/encrypt' // import { useMessage } from 'naive-ui' import router from '@/router' import { createDiscreteApi } from 'naive-ui' +import { set } from 'lodash' const { message } = createDiscreteApi(['message']) let baseApiURL = import.meta.env.VITE_APP_baseApiURL //api原始链接 @@ -75,15 +76,20 @@ service.interceptors.response.use( // return data return Promise.resolve(response) case 401: //表示需要重新登录 - if (!modelShow) { - modelShow = true - if (window.confirm('登录已经失效,是否重新登录?')) { - router.push({ - path: '/login', - }) - } - modelShow = false - } + // if (!modelShow) { + // modelShow = true + // if (window.confirm('登录已经失效,是否重新登录?')) { + // router.push({ + // path: '/login', + // }) + // } + // modelShow = false + // } + + setTimeout(() => { + message.error('登录已经失效,请重新登录') + window.location.href = 'http://sgwpdm.ah.sgcc.com.cn/sgwpdm/#/weblogin' + }, 500) return Promise.reject(data) case 202: //表示失败,参数或其他原因 return Promise.reject(data) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 0d91f0a..c9a6a2d 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -162,29 +162,29 @@ const getDeviceData = async (puId, deviceToken) => { // 获取token const getTokenData = async () => { - getTokenApi({ - username: 'admin', - password: 'admin123', - }).then((res) => { - // 存储token 内部使用 + // getTokenApi({ + // username: 'admin', + // password: 'admin123', + // }).then((res) => { + // // 存储token 内部使用 + // userData.setUserInfo({ + // token: res?.data?.token, + // }) + // }) + + // 从sessionStorage中获取token + const token = sessionStorage.getItem('token') + if (token) { userData.setUserInfo({ - token: res?.data?.token, + token: token, }) - }) + } } const encryptObj = ref('') const decryptObj = ref('') -const testEncrypt = () => { - encryptObj.value = encrypt('1234567890') -} - -const testDecrypt = () => { - decryptObj.value = decrypt(encryptObj.value) -} - -// getTokenData() // 获取token +getTokenData() // 获取token onMounted(async () => { const deviceToken = await getRobotTokenFn() // 获取设备token