mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

个人设置接口对接

This commit is contained in:
Mrtangl 2022-04-15 15:32:37 +08:00
parent 0288224c83
commit 7525c7418a
9 changed files with 96 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/api/auth.ts
View File

@ -53,7 +53,7 @@ export function apiRoleDetail(params: any) {
// 角色权限菜单 // 角色权限菜单
export function apiConfigGetMenu() { export function apiConfigGetMenu() {
return request.get('/config/getMenu') return request.get('/system/menu/lists')
} }
// 角色权限 // 角色权限

3
admin/src/api/user.ts
View File

@ -15,3 +15,6 @@ export function apiLogout() {
export function apiUserInfo() { export function apiUserInfo() {
return request.get('/system/admin/self') return request.get('/system/admin/self')
} }
export function apiAdminUpInfo(params: any) {
return request.post('/system/admin/upInfo', params)
}

4
admin/src/core/hooks/pages.ts
View File

@ -31,8 +31,8 @@ export function usePages(options: Options) {
} }
pager.loading = true pager.loading = true
return callback({ return callback({
page_no: pager.page, pageNo: pager.page,
page_size: pager.size, pageSize: pager.size,
...params ...params
}) })
.then((res: any) => { .then((res: any) => {

5
admin/src/layout/components/layout-header.vue
View File

@ -10,6 +10,11 @@
<el-icon class="el-icon--right"><arrow-down /></el-icon> <el-icon class="el-icon--right"><arrow-down /></el-icon>
</div> </div>
<template #dropdown> <template #dropdown>
<el-dropdown-menu>
<router-link to="/setting/personal/personal_data">
<el-dropdown-item>个人设置</el-dropdown-item>
</router-link>
</el-dropdown-menu>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item command="logout">退出登录</el-dropdown-item> <el-dropdown-item command="logout">退出登录</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>

111
admin/src/router/modules/setting.ts
View File

@ -10,19 +10,19 @@ const routes: RouteRecordRaw = {
path: '/setting/service', path: '/setting/service',
redirect: '/setting/service/online_service', redirect: '/setting/service/online_service',
component: RouterView, component: RouterView,
meta: { meta: {
title: '客服设置', title: '客服设置',
hidden: true, hidden: true
}, },
children: [ children: [
{ {
path: '/setting/service/online_service', path: '/setting/service/online_service',
component: () => import('@/views/setting/service/online_service.vue'), component: () => import('@/views/setting/service/online_service.vue'),
meta: { meta: {
title: '在线客服', title: '在线客服'
}, }
}, }
], ]
}, },
{ {
path: '/setting/website', path: '/setting/website',
@ -35,16 +35,16 @@ const routes: RouteRecordRaw = {
component: () => import('@/views/setting/website/information.vue'), component: () => import('@/views/setting/website/information.vue'),
meta: { meta: {
title: '网站信息', title: '网站信息',
permission: ['view'], permission: ['view']
}, }
}, },
{ {
path: '/setting/website/filing', path: '/setting/website/filing',
component: () => import('@/views/setting/website/filing.vue'), component: () => import('@/views/setting/website/filing.vue'),
meta: { meta: {
title: '备案信息', title: '备案信息',
permission: ['view'], permission: ['view']
}, }
}, },
{ {
path: '/setting/website/protocol', path: '/setting/website/protocol',
@ -52,37 +52,37 @@ const routes: RouteRecordRaw = {
meta: { meta: {
title: '政策/协议', title: '政策/协议',
permission: ['view'], permission: ['view'],
hidden: true, hidden: true
}, }
}, }
], ]
}, },
{ {
path: '/setting/user', path: '/setting/user',
redirect: '/setting/user', redirect: '/setting/user',
component: RouterView, component: RouterView,
meta: { meta: {
title: '用户设置', title: '用户设置',
hidden: true, hidden: true
}, },
children: [ children: [
{ {
path: '/setting/user', path: '/setting/user',
component: () => import('@/views/setting/user/index.vue'), component: () => import('@/views/setting/user/index.vue'),
meta: { meta: {
title: '用户设置', title: '用户设置',
permission: ['view'], permission: ['view']
}, }
}, },
{ {
path: '/setting/user/login', path: '/setting/user/login',
component: () => import('@/views/setting/user/login.vue'), component: () => import('@/views/setting/user/login.vue'),
meta: { meta: {
title: '登录注册', title: '登录注册',
permission: ['view'], permission: ['view']
}, }
}, }
], ]
}, },
{ {
path: '/setting/system', path: '/setting/system',
@ -95,37 +95,38 @@ const routes: RouteRecordRaw = {
component: () => import('@/views/setting/system/environment.vue'), component: () => import('@/views/setting/system/environment.vue'),
meta: { meta: {
title: '系统环境', title: '系统环境',
permission: ['view'], permission: ['view']
}, }
}, },
{ {
path: '/setting/website/journal', path: '/setting/website/journal',
component: () => import('@/views/setting/system/journal.vue'), component: () => import('@/views/setting/system/journal.vue'),
meta: { meta: {
title: '系统日志', title: '系统日志',
permission: ['view'], permission: ['view']
}, }
}, },
{ {
path: '/setting/website/cache', path: '/setting/website/cache',
component: () => import('@/views/setting/system/cache.vue'), component: () => import('@/views/setting/system/cache.vue'),
meta: { meta: {
title: '系统缓存', title: '系统缓存',
permission: ['view'], permission: ['view']
}, }
}, }
], ]
}, },
{ {
// component: RouterView, // component: RouterView,
path: '/setting/personal/personal_data', path: '/setting/personal/personal_data',
component: () => import('@/views/setting/personal/personal_data.vue'), component: () => import('@/views/setting/personal/personal_data.vue'),
meta: { meta: {
title: '个人设置', title: '个人设置',
permission: ['view'], permission: ['view'],
}, hidden: true
}, }
], }
]
} }
export default routes export default routes

15
admin/src/views/permission/role/edit.vue
View File

@ -26,6 +26,13 @@
:autosize="{ minRows: 4, maxRows: 6 }" :autosize="{ minRows: 4, maxRows: 6 }"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- 排序 -->
<el-form-item label="排序">
<el-input v-model="formData.sort" placeholder="请输入" type="number"></el-input>
</el-form-item>
<el-form-item label="状态">
<el-switch v-model="formData.isDisable" :active-value="0" :inactive-value="1" />
</el-form-item>
<!-- 权限 --> <!-- 权限 -->
<el-form-item label="权限" prop="auth_keys"> <el-form-item label="权限" prop="auth_keys">
<div class="flex" style="margin-top: 3px"> <div class="flex" style="margin-top: 3px">
@ -40,8 +47,8 @@
default-expand-all default-expand-all
icon="ArrowRight" icon="ArrowRight"
:props="{ :props="{
children: 'sons', children: 'children',
label: 'name' label: 'menuName'
}" }"
empty-text="" empty-text=""
show-checkbox show-checkbox
@ -86,7 +93,9 @@ export default defineComponent({
formData: { formData: {
name: '', // 角色名称 name: '', // 角色名称
remark: '', // 备注 remark: '', // 备注
auth_keys: [] // 权限 auth_keys: [], // 权限
isDisable: 0,
sort: ''
}, },
menu: { menu: {

2
admin/src/views/permission/role/index.vue
View File

@ -9,7 +9,9 @@
<el-table :data="pager.lists" size="medium"> <el-table :data="pager.lists" size="medium">
<el-table-column prop="id" label="ID"></el-table-column> <el-table-column prop="id" label="ID"></el-table-column>
<el-table-column prop="name" label="名称"></el-table-column> <el-table-column prop="name" label="名称"></el-table-column>
<el-table-column prop="sort" label="排序"></el-table-column>
<el-table-column prop="remark" label="备注"></el-table-column> <el-table-column prop="remark" label="备注"></el-table-column>
<el-table-column prop="isDisable" label="状态"></el-table-column>
<el-table-column prop label="权限"></el-table-column> <el-table-column prop label="权限"></el-table-column>
<el-table-column prop="createTime" label="创建时间"></el-table-column> <el-table-column prop="createTime" label="创建时间"></el-table-column>
<el-table-column prop label="操作"> <el-table-column prop label="操作">

5
admin/src/views/setting/personal/personal_data.vue
View File

@ -64,7 +64,7 @@ import type { ElForm } from 'element-plus'
import MaterialSelect from '@/components/material-select/index.vue' import MaterialSelect from '@/components/material-select/index.vue'
import FooterBtns from '@/components/footer-btns/index.vue' import FooterBtns from '@/components/footer-btns/index.vue'
import { apiAdminEdit, apiAdminDetail } from '@/api/auth' import { apiAdminEdit, apiAdminDetail } from '@/api/auth'
import { apiUserInfo } from '@/api/user' import { apiUserInfo, apiAdminUpInfo } from '@/api/user'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useAdmin } from '@/core/hooks/app' import { useAdmin } from '@/core/hooks/app'
@ -103,6 +103,7 @@ const rules = reactive<object>({
// 获取个人设置 // 获取个人设置
const getAuthAdminMySelf = async (): Promise<void> => { const getAuthAdminMySelf = async (): Promise<void> => {
formData.value = await apiUserInfo() formData.value = await apiUserInfo()
console.log(formData.value, 'formData')
} }
// 设置个人设置 // 设置个人设置
@ -140,7 +141,7 @@ const setAuthAdminEditSelf = async (): Promise<void> => {
} }
} }
await apiAdminEdit({ ...formData.value }) await apiAdminUpInfo({ ...formData.value })
getAuthAdminMySelf() getAuthAdminMySelf()
store.dispatch('user/getUser') store.dispatch('user/getUser')
} }

24
admin/src/views/setting/system/journal.vue
View File

@ -111,19 +111,19 @@ const visitType = ref<Array<any>>([
{ {
label: 'post', label: 'post',
value: 'post' value: 'post'
},
{
label: 'put',
value: 'put'
},
{
label: 'delete',
value: 'delete'
},
{
label: 'option',
value: 'option'
} }
// {
// label: 'put',
// value: 'put'
// },
// {
// label: 'delete',
// value: 'delete'
// },
// {
// label: 'option',
// value: 'option'
// }
]) ])
const { pager, requestApi, resetParams, resetPage } = usePages({ const { pager, requestApi, resetParams, resetPage } = usePages({