Web/admin-govern
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理

Browse Source
This commit is contained in:
仲么了
2024-01-22 14:21:31 +08:00
parent 08e0e9e013
commit 0bf750e5ae
13 changed files with 432 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/api/user-boot/user.ts
View File

@@ -1,4 +1,60 @@
import request from '@/utils/request'
import { LoginData } from '@/api/types'
import { useAdminInfo } from '@/stores/adminInfo'
import { sm3Digest } from '@/assets/commjs/sm3.js'
import { sm2 } from '@/assets/commjs/sm2.js'
// 获取公钥
export function gongkey(params?: any) {
if (!params) {
const adminInfo = useAdminInfo()
params = {
loginName: adminInfo.$state.loginName
}
}
return request({
url: '/user-boot/user/generateSm2Key',
method: 'get',
params
})
}
export async function pwdSm3(pwd: any) {
let publicKey = await gongkey()
let sm3Pwd = sm3Digest(pwd) //SM3加密
return sm2(sm3Pwd + '|' + pwd, publicKey.data, 0)
}
//登录获取token
export function login(params: LoginData) {
return request({
url: '/pqs-auth/oauth/token',
method: 'post',
params
})
}
// 刷新token
export function refreshToken(): Promise<any> {
const adminInfo = useAdminInfo()
return login({
grant_type: 'refresh_token',
refresh_token: adminInfo.refresh_token,
username: adminInfo.username
})
}
/**
* 获取营销用户列表
* @returns {AxiosPromise}
*/
export const getMarketList = () => {
return request({
url: '/user-boot/user/getMarketList',
method: 'post'
})
}
export function add(data: any) {
return request({
@@ -15,3 +71,38 @@ export function edit(data: any) {
data: data
})
}
export async function passwordConfirm(pwd: string) {
return request({
url: '/user-boot/user/passwordConfirm?password=' + await pwdSm3(pwd),
method: 'get'
})
}
export function deluser(data: any) {
return request({
url: '/user-boot/user/delete',
method: 'delete',
params: data
})
}
export function activateUser(data: any) {
return request({
url: '/user-boot/user/activateUser',
method: 'put',
params: data
})
}
export async function updatePassword(params: any) {
return request({
url: '/user-boot/user/updatePassword',
method: 'put',
params: {
id: params.id,
newPassword: await pwdSm3(params.newPassword)
}
})
}

42
src/api/user.ts
View File

@@ -1,42 +0,0 @@
import createAxios from '@/utils/request'
import { useAdminInfo } from '@/stores/adminInfo'
import { LoginData } from './types'
// 获取公钥
export function gongkey(params: any) {
return createAxios({
url: '/user-boot/user/generateSm2Key',
method: 'get',
params
})
}
//登录获取token
export function login(params: LoginData) {
return createAxios({
url: '/pqs-auth/oauth/token',
method: 'post',
params
})
}
// 刷新token
export function refreshToken(): Promise<any> {
const adminInfo = useAdminInfo()
return login({
grant_type: 'refresh_token',
refresh_token: adminInfo.refresh_token,
username: adminInfo.username
})
}
/**
* 获取营销用户列表
* @returns {AxiosPromise}
*/
export const getMarketList = () => {
return createAxios({
url: '/user-boot/user/getMarketList',
method: 'post',
})
}

3
src/components/table/defaultAttribute.ts
View File

@@ -12,5 +12,6 @@ export const defaultAttribute: VxeTableProps = {
scrollY: { scrollToTopOnChange: true, enabled: true },
treeConfig: {
reserve: true
}
},
showOverflow:true
}

2
src/components/tree/govern/getMarketList.vue
View File

@@ -2,7 +2,7 @@
<Tree ref="treRef" :data="tree" />
</template>
<script setup lang="ts">
import { getMarketList } from '@/api/user'
import { getMarketList } from '@/api/user-boot/user'
import Tree from '../index.vue'
import { useConfig } from '@/stores/config'
import { ref, reactive, nextTick } from 'vue'

293
src/layouts/admin/index.vue
View File

@@ -58,234 +58,69 @@ const init = async () => {
* 后台初始化请求，获取站点配置，动态路由等信息
*/
getRouteMenu().then((res: any) => {
// const arr = [
// {
// id: 1,
// pid: 0,
// type: 'menu',
// title: '控制台',
// name: 'dashboard',
// path: 'dashboard',
// icon: 'fa fa-dashboard',
// menu_type: 'tab',
// url: '',
// component: '/src/views/govern/log/debug.vue',
// keepalive: 'dashboard',
// extend: 'none',
// children: []
// },
// {
// id: 3,
// pid: 0,
// type: 'menu',
// title: '审计管理',
// name: 'test',
// path: 'test',
// icon: 'el-icon-List',
// menu_type: 'tab',
// url: '',
// component: '/src/views/govern/setting/app/index.vue',
// keepalive: 'test',
// extend: 'none',
// children: [
// {
// id: 1,
// pid: 3,
// type: 'menu',
// title: '图表1',
// name: 'comptroller/list1',
// path: 'comptroller/list1',
// icon: 'el-icon-List',
// menu_type: 'tab',
// url: '',
// component: '/src/views/govern/user/roleCode/index.vue',
// keepalive: 'auth/role',
// extend: 'none',
// children: []
// }
// ]
// },
// {
// id: 3,
// pid: 0,
// type: 'menu_dir',
// title: '电压暂降',
// name: 'voltage/sags',
// path: 'voltage/sags',
// icon: 'el-icon-BellFilled',
// menu_type: 'tab',
// url: '',
// extend: 'none',
// children: [
// {
// id: 1,
// pid: 3,
// type: 'menu_dir',
// title: '运行管理',
// name: 'voltage/sags/operationsManagement',
// path: 'voltage/sags/operationsManagement',
// icon: 'fa-solid fa-bars-progress',
// menu_type: 'tab',
// url: '',
// extend: 'none',
// children: [
// {
// id: 1,
// pid: 3,
// type: 'menu',
// title: '终端运行管理',
// name: 'voltage/sags/operationsManagement/index',
// path: 'voltage/sags/operationsManagement/index',
// icon: 'fa-solid fa-recycle',
// menu_type: 'tab',
// url: '',
// component: '/src/views/voltage/sags/operationsManagement/index.vue',
// keepalive: 'voltage/sags/operationsManagement/index',
// extend: 'none',
// children: []
// },
// {
// id: 1,
// pid: 3,
// type: 'menu',
// title: '终端运行统计',
// name: 'voltage/sags/operationsManagement/statistics',
// path: 'voltage/sags/operationsManagement/statistics',
// icon: 'fa-solid fa-chart-column',
// menu_type: 'tab',
// url: '',
// component: '/src/views/voltage/sags/operationsManagement/statistics.vue',
// keepalive: 'voltage/sags/operationsManagement/statistics',
// extend: 'none',
// children: []
// },
// {
// id: 1,
// pid: 3,
// type: 'menu',
// title: '监测点台账信息',
// name: 'voltage/sags/operationsManagement/point',
// path: 'voltage/sags/operationsManagement/point',
// icon: 'fa-brands fa-square-pinterest',
// menu_type: 'tab',
// url: '',
// component: '/src/views/voltage/sags/operationsManagement/point.vue',
// keepalive: 'voltage/sags/operationsManagement/point',
// extend: 'none',
// children: []
// }
// ]
// },
// {
// id: 2,
// pid: 3,
// type: 'menu',
// title: '区域',
// name: 'Event-boot/Region/distribution',
// path: 'Event-boot/Region/distribution',
// icon: 'el-icon-Management',
// menu_type: 'tab',
// url: '',
// component: '/src/views/Event-boot/Region/distribution.vue',
// keepalive: 'Event-boot/Region/distribution',
// extend: 'none',
// children: [
// {
// id: 2,
// pid: 3,
// type: 'menu',
// title: '区域概览',
// name: 'Region/overview',
// path: 'Region/overview',
// icon: 'el-icon-Promotion',
// menu_type: 'tab',
// url: '',
// component: '/src/views/Event-boot/Region/overview.vue',
// keepalive: 'Region/overview',
// extend: 'none',
// children: []
// },
// {
// id: 2,
// pid: 3,
// type: 'menu',
// title: '区域统计',
// name: 'Region/statistics',
// path: 'Region/statistics',
// icon: 'el-icon-Promotion',
// menu_type: 'tab',
// url: '',
// component: '/src/views/Event-boot/Region/statistics.vue',
// keepalive: 'Region/statistics',
// extend: 'none',
// children: []
// },
// {
// id: 1,
// pid: 3,
// type: 'menu',
// title: '监测网分布',
// name: 'Region/distribution',
// path: 'Region/distribution',
// icon: 'el-icon-Share',
// menu_type: 'tab',
// url: '',
// component: '/src/views/Event-boot/Region/distribution.vue',
// keepalive: 'Region/distribution',
// extend: 'none',
// children: []
// }
// ]
// }
// ]
// },
// {
// id: 2,
// pid: 0,
// type: 'menu_dir',
// title: '权限管理',
// name: 'auth',
// path: 'auth',
// icon: 'fa-solid fa-layer-group',
// menu_type: null,
// url: '',
// component: '',
// keepalive: 0,
// extend: 'none',
// children: [
// {
// id: 3,
// pid: 2,
// type: 'menu',
// title: '角色管理',
// name: 'auth/role',
// path: 'auth/role',
// icon: 'el-icon-Avatar',
// menu_type: 'tab',
// url: '',
// component: '/src/views/auth/role/index.vue',
// keepalive: 'auth/role',
// extend: 'none',
// children: []
// },
// {
// id: 13,
// pid: 2,
// type: 'menu',
// title: '菜单规则管理',
// name: 'auth/menu',
// path: 'auth/menu',
// icon: 'el-icon-Menu',
// menu_type: 'tab',
// url: '',
// component: '/src/views/auth/menu/index.vue',
// keepalive: 'auth/menu',
// extend: 'none',
// children: []
// }
// ]
// }
// ]
const arr = [
{
id: 2,
pid: 0,
type: 'menu_dir',
title: '权限管理',
name: 'auth',
path: 'auth',
icon: 'fa-solid fa-layer-group',
menu_type: null,
url: '',
component: '',
keepalive: 0,
extend: 'none',
children: [
{
id: 3,
pid: 2,
type: 'menu',
title: '用户管理',
name: 'auth/userList',
path: 'auth/userList',
icon: 'el-icon-Avatar',
menu_type: 'tab',
url: '',
component: '/src/views/auth/userList/index.vue',
keepalive: 'auth/userList',
extend: 'none',
children: []
},
{
id: 3,
pid: 2,
type: 'menu',
title: '角色管理',
name: 'auth/role',
path: 'auth/role',
icon: 'el-icon-Avatar',
menu_type: 'tab',
url: '',
component: '/src/views/auth/role/index.vue',
keepalive: 'auth/role',
extend: 'none',
children: []
},
{
id: 13,
pid: 2,
type: 'menu',
title: '菜单规则管理',
name: 'auth/menu',
path: 'auth/menu',
icon: 'el-icon-Menu',
menu_type: 'tab',
url: '',
component: '/src/views/auth/menu/index.vue',
keepalive: 'auth/menu',
extend: 'none',
children: []
}
]
}
]
const handlerMenu = (data: any) => {
data.forEach((item: any) => {
item.path = item.routePath
@@ -300,7 +135,7 @@ const init = async () => {
})
}
handlerMenu(res.data)
handleAdminRoute(res.data)
handleAdminRoute([...res.data,...arr])
// 预跳转到上次路径
if (route.params.to) {
const lastRoute = JSON.parse(route.params.to as string)

3
src/stores/adminInfo.ts
View File

@@ -16,7 +16,8 @@ export const useAdminInfo = defineStore('adminInfo', {
userIndex: '',
client_id: '',
headSculpture: '',
jti: ''
jti: '',
loginName: ''
}
},
actions: {

17
src/utils/common.ts
View File

@@ -128,3 +128,20 @@ export const timeFormat = (dateTime: string | number | null = null, fmt = 'yyyy-
}
return fmt
}
/**
* el-form 密码正则校验 密码需要包含特殊字符字母数字，长度为8-16
*/
export const validatePwd = (rule: any, value: string, callback: any) => {
if (value === '') {
callback(new Error('请输入密码'))
} else {
const reg = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@#$%^&+=!])(?=.*[a-zA-Z0-9])[A-Za-z\d@#$%^&+=!]{8,16}$/
if (!reg.test(value)) {
callback(new Error('密码需要包含特殊字符字母数字，长度为8-16'))
} else {
callback()
}
}
}

4
src/utils/request.ts
View File

@@ -1,7 +1,7 @@
import type { AxiosRequestConfig, Method } from 'axios'
import axios from 'axios'
import { ElLoading, ElNotification, type LoadingOptions } from 'element-plus'
import { refreshToken } from '@/api/user'
import { refreshToken } from '@/api/user-boot/user'
import router from '@/router/index'
import { useAdminInfo } from '@/stores/adminInfo'
@@ -67,8 +67,6 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
// 自动携带token
if (config.headers) {
const token = adminInfo.getToken()
console.log(token)
console.log(token.length, 'token')
if (token) {
;(config.headers as anyObj).Authorization = token
} else {

81
src/views/auth/userlist/index.vue → src/views/auth/userList/index.vue
View File

@@ -1,48 +1,50 @@
<template>
<div class="default-main">
<div class='default-main'>
<TableHeader>
<template v-slot:select>
<el-form-item label="用户状态">
<el-select v-model="tableStore.table.params.searchState" placeholder="选择用户状态">
<el-form-item label='用户状态'>
<el-select v-model='tableStore.table.params.searchState' placeholder='选择用户状态'>
<el-option
v-for="(item, index) in userState"
:label="item.label"
:key="index"
:value="item.value"
v-for='(item, index) in userState'
:label='item.label'
:key='index'
:value='item.value'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="用户类型:">
<el-select v-model="tableStore.table.params.casualUser" placeholder="选择用户类型">
<el-form-item label='用户类型:'>
<el-select v-model='tableStore.table.params.casualUser' placeholder='选择用户类型'>
<el-option
v-for="(item, index) in casualUser"
:label="item.label"
:key="index"
:value="item.value"
v-for='(item, index) in casualUser'
:label='item.label'
:key='index'
:value='item.value'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关键词:">
<el-form-item label='关键词:'>
<el-input
style="width: 240px"
v-model="tableStore.table.params.searchValue"
style='width: 240px'
v-model='tableStore.table.params.searchValue'
clearable
placeholder="仅根据用户名/登录名"
placeholder='仅根据用户名/登录名'
/>
</el-form-item>
</template>
<template v-slot:operation>
<el-button :icon="Plus" type="primary" @click="addUser">添加</el-button>
<el-button :icon='Plus' type='primary' @click='addUser'>添加</el-button>
</template>
</TableHeader>
<Table ref="tableRef" />
<PopupEdit ref="popupEditRef"></PopupEdit>
<PopupPwd ref="popupPwdRef"></PopupPwd>
<Table ref='tableRef' />
<PopupEdit ref='popupEditRef'></PopupEdit>
<PopupPwd ref='popupPwdRef'></PopupPwd>
</div>
</template>
<script setup lang="ts">
<script setup lang='ts'>
import { Plus } from '@element-plus/icons-vue'
import { ref, onMounted, provide } from 'vue'
import { ElMessageBox, ElMessage } from 'element-plus'
import { activateUser, deluser, passwordConfirm } from '@/api/user-boot/user'
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
@@ -60,9 +62,9 @@ const tableStore = new TableStore({
column: [
{ title: '用户名称', field: 'name', minWidth: '130' },
{ title: '登录名', field: 'loginName', minWidth: '130' },
{ title: '角色', field: 'role', minWidth: '130' },
{ title: '角色', field: 'roleName', minWidth: '130' },
{ title: '部门', field: 'deptName', minWidth: '200' },
{ title: '电话', field: 'phone', minWidth: '100' },
{ title: '电话', field: 'phoneShow', minWidth: '100' },
{ title: '注册时间', field: 'registerTime', minWidth: '130' },
{ title: '登录时间', field: 'loginTime', minWidth: '130' },
{ title: '类型', field: 'casualUserName', minWidth: '80' },
@@ -96,7 +98,7 @@ const tableStore = new TableStore({
return row.state !== 1
},
click: row => {
popupPwdRef.value.open('修改密码', row)
popupPwdRef.value.open(row.id)
}
},
{
@@ -108,7 +110,14 @@ const tableStore = new TableStore({
disabled: row => {
return row.state !== 2 && row.state !== 5 && row.state !== 0 && row.state !== 4
},
click: row => {}
click: row => {
activateUser({
id: row.id
}).then(() => {
ElMessage.success('激活成功')
tableStore.index()
})
}
},
{
name: 'edit',
@@ -119,7 +128,23 @@ const tableStore = new TableStore({
disabled: row => {
return row.state !== 1 && row.state !== 3
},
click: row => {}
click: row => {
ElMessageBox.prompt('二次校验密码确认', '注销用户', {
confirmButtonText: '确认',
cancelButtonText: '取消',
inputType: 'password'
})
.then(({ value }) => {
passwordConfirm(value).then(res => {
deluser({
id: row.id
}).then(() => {
ElMessage.success('注销成功')
tableStore.index()
})
})
})
}
}
]
}
@@ -128,6 +153,8 @@ const tableStore = new TableStore({
loadCallback: () => {
tableStore.table.data.forEach((item: any) => {
item.deptName = item.deptName || '/'
item.phoneShow = item.phone || '/'
item.roleName = item.role.length ? item.role : '/'
switch (item.casualUser) {
case 0:
item.casualUserName = '临时用户'

147
src/views/auth/userlist/popupEdit.vue → src/views/auth/userList/popupEdit.vue
View File

@@ -1,95 +1,96 @@
<template>
<el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
<el-dialog class='cn-operate-dialog' v-model='dialogVisible' :title='title'>
<el-scrollbar>
<el-form :inline="true" :model="form" label-width="120px" :rules="rules">
<el-form-item label="用户名" prop="name">
<el-input v-model="form.name" placeholder="请输入昵称" />
<el-form :inline='true' :model='form' label-width='120px' :rules='rules'>
<el-form-item label='用户名' prop='name'>
<el-input v-model='form.name' placeholder='请输入昵称' />
</el-form-item>
<el-form-item label="登录名" prop="loginName">
<el-input v-model="form.loginName" placeholder="请输入登录名" />
<el-form-item label='登录名' prop='loginName'>
<el-input v-model='form.loginName' placeholder='请输入登录名' />
</el-form-item>
<el-form-item label="默认密码" prop="password" v-if="form.id">
<el-input v-model="form.password" placeholder="请输入密码" />
<el-form-item label='默认密码' prop='password' v-if="title === '新增用户'">
<el-input v-model='form.password' placeholder='请输入密码' disabled />
</el-form-item>
<el-form-item label="权限类型" prop="type">
<el-form-item label='权限类型' prop='type'>
<el-select
style="width: 100%"
v-model="form.type"
@change="changeValue"
style='width: 100%'
v-model='form.type'
@change='changeValue'
disabled
placeholder="请选择权限类型"
placeholder='请选择权限类型'
>
<el-option
v-for="(item, index) in UserTypeOption"
:label="item.label"
:value="item.value"
:key="index"
v-for='(item, index) in UserTypeOption'
:label='item.label'
:value='item.value'
:key='index'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="用户类型" prop="casualUser">
<el-select style="width: 100%" v-model="form.casualUser" placeholder="请选择权限类型">
<el-form-item label='用户类型' prop='casualUser'>
<el-select style='width: 100%' v-model='form.casualUser' placeholder='请选择权限类型'>
<el-option
v-for="(item, index) in TypeOptions"
:label="item.label"
:value="item.value"
:key="index"
v-for='(item, index) in TypeOptions'
:label='item.label'
:value='item.value'
:key='index'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属部门" prop="deptName">
<Area style="width: 100%" v-model="form.deptName" />
<el-form-item label='所属部门' prop='deptId'>
<Area style='width: 100%' v-model='form.deptId' />
</el-form-item>
<el-form-item label="角色" prop="role">
<el-select style="width: 100%" v-model="form.role" placeholder="请选择角色">
<el-form-item label='角色' prop='role'>
<el-select style='width: 100%' v-model='form.role' placeholder='请选择角色' multiple collapse-tags>
<el-option
v-for="(item, index) in roleOptions"
:label="item.label"
:value="item.value"
:key="index"
v-for='(item, index) in roleOptions'
:label='item.label'
:value='item.value'
:key='index'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" />
<el-form-item label='手机号' prop='phone'>
<el-input v-model='form.phone' placeholder='请输入手机号' />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入描述" />
<el-form-item label='邮箱' prop='email'>
<el-input v-model='form.email' placeholder='请输入描述' />
</el-form-item>
<el-form-item label="起始IP" prop="limitIpStart">
<el-input v-model="form.limitIpStart" placeholder="请输入描述" />
<el-form-item label='起始IP' prop='limitIpStart'>
<el-input v-model='form.limitIpStart' placeholder='请输入描述' />
</el-form-item>
<el-form-item label="结束IP" prop="limitIpEnd">
<el-input v-model="form.limitIpEnd" placeholder="请输入描述" />
<el-form-item label='结束IP' prop='limitIpEnd'>
<el-input v-model='form.limitIpEnd' placeholder='请输入描述' />
</el-form-item>
<el-form-item label="时间段" prop="limitTime">
<el-slider v-model="form.limitTime" range show-stops :max="24" />
<el-form-item label='时间段' prop='limitTime'>
<el-slider v-model='form.limitTime' range show-stops :max='24' />
</el-form-item>
<el-form-item label="短信通知" prop="smsNotice">
<el-radio-group v-model="form.smsNotice">
<el-radio-button :label="0">是</el-radio-button>
<el-radio-button :label="1">否</el-radio-button>
<el-form-item label='短信通知' prop='smsNotice'>
<el-radio-group v-model='form.smsNotice'>
<el-radio-button :label='0'>是</el-radio-button>
<el-radio-button :label='1'>否</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="邮件通知" prop="emailNotice">
<el-radio-group v-model="form.emailNotice">
<el-radio-button :label="0">是</el-radio-button>
<el-radio-button :label="1">否</el-radio-button>
<el-form-item label='邮件通知' prop='emailNotice'>
<el-radio-group v-model='form.emailNotice'>
<el-radio-button :label='0'>是</el-radio-button>
<el-radio-button :label='1'>否</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="用户ID">
<div style="display: flex; width: 100%">
<el-radio-group v-model="useId">
<el-radio-button :label="1">是</el-radio-button>
<el-radio-button :label="0">否</el-radio-button>
<el-form-item label='用户ID'>
<div style='display: flex; width: 100%'>
<el-radio-group v-model='useId'>
<el-radio-button :label='1'>是</el-radio-button>
<el-radio-button :label='0'>否</el-radio-button>
</el-radio-group>
<el-input
v-model="form.id"
placeholder="请输入用户id"
v-if="useId"
style="flex: 1"
class="ml10"
:disabled="title !== '新增用户'"
v-model='form.id'
placeholder='请输入用户id'
v-if='useId'
style='flex: 1'
class='ml10'
></el-input>
</div>
</el-form-item>
@@ -97,14 +98,14 @@
</el-scrollbar>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="submit">确认</el-button>
<span class='dialog-footer'>
<el-button @click='dialogVisible = false'>取消</el-button>
<el-button type='primary' @click='submit'>确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
<script lang='ts' setup>
import { ref, inject } from 'vue'
import { reactive } from 'vue'
import TableStore from '@/utils/tableStore'
@@ -113,6 +114,7 @@ import { roleList } from '@/api/user-boot/role'
import { add, edit } from '@/api/user-boot/user'
import { useAdminInfo } from '@/stores/adminInfo'
import Area from '@/components/form/area/index.vue'
import { de } from 'element-plus/es/locale'
const adminInfo = useAdminInfo()
const tableStore = inject('tableStore') as TableStore
@@ -140,7 +142,6 @@ const rules = {
role: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
loginName: [{ required: true, message: '登录名不能为空', trigger: 'blur' }],
deptId: [{ required: true, message: '归属部门不能为空', trigger: 'blur' }],
casualUser: [{ required: true, message: '用户类型不能为空', trigger: 'blur' }],
smsNotice: [{ required: true, message: '短信通知不能为空', trigger: 'blur' }],
emailNotice: [{ required: true, message: '邮件通知不能为空', trigger: 'blur' }],
@@ -148,7 +149,7 @@ const rules = {
{ required: false, message: '邮箱不能为空', trigger: 'blur' },
{
type: 'email',
message: "'请输入正确的邮箱地址",
message: '\'请输入正确的邮箱地址',
trigger: ['blur', 'change']
}
],
@@ -228,30 +229,33 @@ const open = (text: string, data?: anyObj) => {
for (let key in form) {
form[key] = data[key]
}
form.role = data.roleList.length ? data.roleList[0] : ''
form.limitTime = data.limitTime.split('-')
form.role = data.roleList
} else {
for (let key in form) {
form[key] = ''
}
form.casualUser = 1
form.limitTime = [0, 24]
form.limitTime = [0, 23]
form.role = []
form.smsNotice = 0
form.emailNotice = 0
useId.value = 1
form.id = ''
form.limitIpStart = '0.0.0.0'
form.limitIpEnd = '255.255.255.255'
form.password = '123456'
}
form.type = adminInfo.$state.userType + 1
}
const submit = async () => {
let obj = JSON.parse(JSON.stringify(form))
obj.limitTime = obj.limitTime.join('-')
obj.type = adminInfo.$state.userType + 1
obj.role = [obj.role]
delete obj.password
if (form.id) {
await edit(obj)
ElMessage.success('修改成功')
} else {
delete obj.id
form.type = adminInfo.$state.userType + 1
await add(obj)
ElMessage.success('新增成功')
@@ -260,6 +264,7 @@ const submit = async () => {
dialogVisible.value = false
}
const changeValue = () => {}
const changeValue = () => {
}
defineExpose({ open })
</script>

122
src/views/auth/userList/popupPwd.vue Normal file
View File

@@ -0,0 +1,122 @@
<template>
<el-dialog class='cn-operate-dialog' v-model='dialogVisible' title='修改密码'>
<el-scrollbar>
<el-form :inline='false' :model='form' label-width='120px' :rules='rules' ref='formRef'>
<el-form-item label='校验密码' prop='password'>
<el-input v-model='form.password' type='password' placeholder='请输入校验密码' show-password />
</el-form-item>
<el-form-item label='新密码' prop='newPwd'>
<el-input v-model='form.newPwd' type='password' placeholder='请输入新密码' show-password />
</el-form-item>
<el-form-item label='确认密码' prop='confirmPwd'>
<el-input v-model='form.confirmPwd' type='password' placeholder='请输入确认密码' show-password />
</el-form-item>
</el-form>
</el-scrollbar>
<template #footer>
<span class='dialog-footer'>
<el-button @click='dialogVisible = false'>取消</el-button>
<el-button type='primary' @click='submit'>确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script lang='ts' setup>
import { ref, inject } from 'vue'
import { reactive } from 'vue'
import TableStore from '@/utils/tableStore'
import { ElMessage } from 'element-plus'
import { validatePwd } from '@/utils/common'
import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
const formRef = ref()
const tableStore = inject('tableStore') as TableStore
const form = reactive({
id: '',
password: '',
newPwd: '',
confirmPwd: ''
})
const rules = {
password: [
{ required: true, message: '请输入校验密码', trigger: 'blur' },
{
min: 6,
max: 16,
message: '长度在 6 到 16 个字符',
trigger: 'blur'
},
{
validator: (rule: any, value: string, callback: any) => {
if (value === '') {
callback(new Error('请输入旧密码'))
} else {
passwordConfirm(value).then(res => {
callback()
}).catch(() => {
callback(new Error('旧密码不正确'))
})
}
}, trigger: 'blur'
}
],
newPwd: [
{ required: true, message: '请输入密码', trigger: 'blur' },
{
min: 6,
max: 16,
message: '长度在 6 到 16 个字符',
trigger: 'blur'
},
{ validator: validatePwd, trigger: 'blur' }
],
confirmPwd: [
{ required: true, message: '请确认密码', trigger: 'blur' },
{
min: 6,
max: 16,
message: '长度在 6 到 16 个字符',
trigger: 'blur'
},
{
validator: (rule: any, value: string, callback: any) => {
if (value === '') {
callback(new Error('请再次输入密码'))
} else if (value !== form.newPwd) {
callback(new Error('两次输入密码不一致!'))
} else {
callback()
}
},
trigger: 'blur',
required: true
}
]
}
const dialogVisible = ref(false)
const title = ref('新增菜单')
const open = (id: string) => {
form.id = id
form.password = ''
form.newPwd = ''
form.confirmPwd = ''
dialogVisible.value = true
}
const submit = async () => {
formRef.value.validate((valid) => {
if (valid) {
updatePassword({
id: form.id,
newPassword: form.newPwd
}).then((res: any) => {
ElMessage.success('密码修改成功')
dialogVisible.value = false
})
}
})
}
defineExpose({ open })
</script>

75
src/views/auth/userlist/popupPwd.vue
View File

@@ -1,75 +0,0 @@
<template>
<el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
<el-scrollbar>
<el-form :inline="false" :model="form" label-width="120px" :rules="rules">
<el-form-item label="角色名称">
<el-input v-model="form.name" placeholder="请输入菜单名称" />
</el-form-item>
<el-form-item label="角色编码">
<el-input v-model="form.code" placeholder="请输入菜单名称" />
</el-form-item>
<el-form-item label="角色描述">
<el-input v-model="form.remark" :rows="2" type="textarea" placeholder="请输入描述" />
</el-form-item>
</el-form>
</el-scrollbar>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="submit">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
import { ref, inject } from 'vue'
import { reactive } from 'vue'
import TableStore from '@/utils/tableStore'
import { ElMessage } from 'element-plus'
import { add, update } from '@/api/user-boot/role'
import { useAdminInfo } from '@/stores/adminInfo'
const adminInfo = useAdminInfo()
const tableStore = inject('tableStore') as TableStore
// do not use same name with ref
const form = reactive({
code: '',
name: '',
remark: '',
id: '',
type: 0
})
const rules = {
name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
code: [{ required: true, message: '角色编码不能为空', trigger: 'blur' }]
}
const dialogVisible = ref(false)
const title = ref('新增菜单')
const open = (text: string, data?: anyObj) => {
title.value = text
dialogVisible.value = true
if (data) {
for (let key in form) {
form[key] = data[key]
}
} else {
for (let key in form) {
form[key] = ''
}
}
}
const submit = async () => {
if (form.id) {
await update(form)
} else {
form.type = adminInfo.$state.userType + 1
await add(form)
}
ElMessage.success('保存成功')
tableStore.index()
dialogVisible.value = false
}
defineExpose({ open })
</script>

3
src/views/user/login.vue
View File

@@ -68,7 +68,7 @@ import * as pageBubble from '@/utils/pageBubble'
import { sm3Digest } from '@/assets/commjs/sm3.js'
import { sm2, encrypt } from '@/assets/commjs/sm2.js'
import { ElMessage } from 'element-plus'
import { gongkey, login } from '@/api/user'
import { gongkey, login } from '@/api/user-boot/user'
import { useAdminInfo } from '@/stores/adminInfo'
import type { FormInstance, InputInstance, FormRules } from 'element-plus'
import { useRouter } from 'vue-router'
@@ -137,6 +137,7 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
imageCode: '',
verifyCode: 0
}).then(res => {
res.data.loginName = encrypt(form.username)
userInfo.dataFill(res.data)
state.submitLoading = false
router.push({