From 137910cf4fc73a3a2787a3a02718f1e1f637c368 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 14 六月 2024 16:01:17 +0800
Subject: [PATCH] bug修改
---
src/views/components/loginForm.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/src/views/components/loginForm.vue b/src/views/components/loginForm.vue
index 7ca1476..e2e2f2a 100644
--- a/src/views/components/loginForm.vue
+++ b/src/views/components/loginForm.vue
@@ -1,7 +1,7 @@
<template>
<div class="login-panel">
<div class="login-img">
- <img src="src/assets/images/loginImg.png">
+ <img :src="loginImgPng">
</div>
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">登录系统</h3>
@@ -44,6 +44,10 @@
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
</div>
</el-form-item>
+ <el-radio-group v-model="loginForm.role" class="mb5">
+ <el-radio :label="0" size="large">监管部门</el-radio>
+ <el-radio :label="1" size="large">机构管理员</el-radio>
+ </el-radio-group>
<div style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 25px">
<!-- <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>-->
<el-button
@@ -74,6 +78,7 @@
import { Register } from "@/layout/components";
import { Base64 } from 'js-base64'
import menu from "@/layout/components/Sidebar/menu";
+import loginImgPng from "@/assets/images/loginImg.png"
const userStore = useUserStore()
const route = useRoute();
@@ -81,16 +86,17 @@
const { proxy } = getCurrentInstance();
const loginForm = ref({
- username: "admin",
- password: "admin@123",
+ username: "",
+ password: "",
code: "",
- uuid: ""
+ uuid: "",
+ role: 0
});
const loginRules = {
username: [{ required: true, trigger: "blur", message: "请输入您的账号" }],
password: [{ required: true, trigger: "blur", message: "请输入您的密码" }],
- code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+ code: [{ required: true, trigger: "blur", message: "请输入验证码" }]
};
const codeUrl = ref("");
@@ -103,11 +109,11 @@
const redirect = ref(undefined);
onMounted(()=>{
-
+ Cookies.remove("userState");
})
const openRegist = ()=>{
- regRef.value.dialogVisible = true
+ regRef.value.openDialog('add', {});
}
watch(route, (newRoute) => {
@@ -132,8 +138,15 @@
// Cookies.remove("rememberMe");
// }
// 调用action的登录方法
- loginForm.value.password = Base64.encode(loginForm.value.password)
- userStore.login(loginForm.value).then(() => {
+ // loginForm.value.password = Base64.encode(loginForm.value.password)
+ const param = {
+ username: loginForm.value.username,
+ password: Base64.encode(loginForm.value.password),
+ code: loginForm.value.code,
+ uuid: loginForm.value.uuid,
+ identity: loginForm.value.role
+ }
+ userStore.login(param).then(() => {
// const query = route.query;
// const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
// if (cur !== "redirect") {
@@ -142,12 +155,32 @@
// return acc;
// }, {});
const userInfo = JSON.parse(Cookies.get('userInfo'))
- if(userInfo.identity === 0) {
+ if(userInfo.identity === 0 ) {
+ //监管用户
sidebarRouters.value = menu.adminMenu
Cookies.set('routers',JSON.stringify(sidebarRouters.value))
+ }else if(userInfo.identity === 1) {
+ const userState = JSON.parse(Cookies.get('userState'))
+ console.log("userState",userState)
+ //机构用户
+ //未审核状态不显示菜单
+ if(userState !==2 ){
+ sidebarRouters.value = menu.noMenu
+ Cookies.set('routers',JSON.stringify(sidebarRouters.value))
+ }else {
+ sidebarRouters.value = menu.agencyMenu
+ Cookies.set('routers',JSON.stringify(sidebarRouters.value))
+ }
}
+ let path = ""
+ if(sidebarRouters.value[0].children && sidebarRouters.value[0].children.length > 0){
+ path = sidebarRouters.value[0].path + '/'+ sidebarRouters.value[0].children[0].path
+ }else {
+ path = sidebarRouters.value[0].path
+ }
+
router.push({
- path: sidebarRouters.value[0].path
+ path: path
})
// router.push({ path: redirect.value || "/", query: otherQueryParams });
}).catch(() => {
--
Gitblit v1.9.2