diff --git a/src/router/index.js b/src/router/index.js index 66a2eff..8bb566e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,10 +2,10 @@ import { createRouter, createWebHashHistory } from 'vue-router'; const router = createRouter({ history: createWebHashHistory(), - routes: [//此处在做登录之前做成默认跳转工作台 + routes: [ { path: '/workspace', name: "workspace", component: () => import("../views/workspace/index.vue") }, - { path: '/', redirect: "/login-hxl" }, - {path: "/login-hxl",name: "login-hxl",component: () => import("../views/login-hxl.vue"),}, + { path: '/', redirect: "/login" }, + {path: "/login",name: "login",component: () => import("../views/login.vue"),}, // { path: '/test', component: () => import("../views/z.vue") }, { meta: { requireAuth: true }, diff --git a/src/views/login-hxl.vue b/src/views/login-hxl.vue index b579a4b..1f86bdb 100644 --- a/src/views/login-hxl.vue +++ b/src/views/login-hxl.vue @@ -90,27 +90,17 @@ const login = async function () { const machineId = getQueryVariable("machineId"); console.log(machineId); try { - const result = await axios.post(`http://18.143.76.3:10704/admin/login`, { + const result = await axios.post(`http://192.168.8.220:8081/admin/login`, { account: userInfo.value.username, password: userInfo.value.password, machineId: machineId, }); - // const result = await API({ - // url: "/admin/login", - // data: { - // account: userInfo.username, - // password: userInfo.password, - // machineId: "", - // }, - // }); - - console.log("请求成功", result); if (result.data.code == 200) { + console.log("请求成功", result); ElMessage.success('登录成功'); - router.push({ - name: "workspace", - }); + router.push('/workspace') } else { + console.log("请求失败result", result); ElMessage.error(result.data.msg); } } catch (error) { diff --git a/src/views/login.vue b/src/views/login.vue index efe9035..f6ed862 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -8,28 +8,25 @@ import { VscGlobe } from 'vue-icons-plus/vsc' //获取当前浏览器地址 var url = window.location.href //上传服务器时打开注释并注释掉下一行 -//截取machineId=后的字符串 var machineId = null -// 从浏览器地址获取machineId的方法 +// 获取machineId function getMachineId() { var parts = url.split('machineId=') if (parts.length > 1) { machineId = parts[1].split('&')[0] // 进一步截取 & 之前的字符串 } // machineId = decodeURIComponent(machineId); //如果machineId需要前端转码可以打开注释 - console.log('MachineId字符串:', machineId) // 输出 machineId 的值 - // 将 machineId 存储到本地存储中 + console.log('机器码获取到了吗:', machineId) if (machineId) { + // 将 machineId 存储到本地存储中 localStorage.setItem('machineId', machineId) } } -getMachineId() const router = useRouter() // 获取路由实例 let formData = new FormData() - -const form = ref({ jwcode: '', password: '', token: '', machineId: machineId }) +const form = ref({ account: '', password: '', token: '', machineId: machineId }) //调用方法 const login = async function () { try { @@ -37,54 +34,41 @@ const login = async function () { url: '/admin/login', data: form.value }) - console.log('resultresult', result) + console.log('看看传给后端的参数', form) if (result.code == 200) { localStorage.setItem('token', result.msg) - localStorage.setItem('permission', result.data.permission) - if ( - result.data.permission == '5' || - result.data.permission == '1' || - result.data.permission == '2' || - result.data.permission == '3' - ) { - router.push('/workspace') - } else if (result.data.permission == '4') { - router.push('/noPermission') - } + // localStorage.setItem('permission', result.data.permission) + router.push('/workspace') ElMessage.success('登录成功') console.log('请求成功', result) } else { form.value.password = '' - form.value.jwcode = '' + form.value.account = '' ElMessage.error(result.msg) } } catch (error) { console.log('请求失败', error) ElMessage.error('登录失败，请检查账号密码') - + } } +onMounted(() => { + getMachineId() +})