This commit is contained in:
陈红丽 2024-07-29 15:30:24 +08:00
parent 5b78c3daf1
commit 3fce0f3bf9
4 changed files with 9 additions and 5 deletions

View File

@ -64,6 +64,10 @@ export default {
type: String, type: String,
default: "", default: "",
}, },
name: {
type: String,
default: "data",
},
height: { height: {
type: Number, type: Number,
default: 0, default: 0,
@ -213,7 +217,7 @@ export default {
try { try {
const formData = new FormData() const formData = new FormData()
formData.append('file',file) formData.append('file',file)
formData.append('name','notice') formData.append('name',this.name)
const res = await upload(formData) const res = await upload(formData)
loading.close() loading.close()
return { return {

View File

@ -131,7 +131,7 @@
<div class="layout-header-trigger layout-header-trigger-min"> <div class="layout-header-trigger layout-header-trigger-min">
<el-dropdown trigger="hover" @command="avatarSelect"> <el-dropdown trigger="hover" @command="avatarSelect">
<div class="avatar"> <div class="avatar">
<el-avatar round :src="schoolboy" /> <el-avatar round :src="userAvatar?userAvatar:schoolboy" />
</div> </div>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
@ -235,6 +235,7 @@
const amendPwdRef = ref(); const amendPwdRef = ref();
// const username = userStore?.info ? ref(userStore?.info.username) : ''; // const username = userStore?.info ? ref(userStore?.info.username) : '';
const userAvatar = userStore.getAvatar
const collapsed = inject('collapsed'); const collapsed = inject('collapsed');

View File

@ -67,7 +67,7 @@ export const routerGenerator = (routerMap, parent?): any[] => {
} else { } else {
if(item.parentId==0 && item.children.length==0) { if(item.parentId==0 && item.children.length==0) {
currentRouter.children =[] currentRouter.children =[]
if(item.target==1){ if(item.target==1 && (/http(s)?:/.test(item.component))){
currentRouter.children.push({ currentRouter.children.push({
path: item.path, path: item.path,
name: names, name: names,
@ -103,7 +103,6 @@ export const generatorDynamicRouter = (): Promise<RouteRecordRaw[]> => {
adminMenus() adminMenus()
.then((result) => { .then((result) => {
const routeList = routerGenerator(result); const routeList = routerGenerator(result);
console.log(routeList)
asyncImportRoute(routeList); asyncImportRoute(routeList);
resolve(routeList); resolve(routeList);
}) })

View File

@ -10,7 +10,7 @@ const routeModuleList: RouteRecordRaw[] = [];
const modulesVue = import.meta.glob('/src/views/**/*.vue') const modulesVue = import.meta.glob('/src/views/**/*.vue')
export function getModulesKey() { export function getModulesKey() {
return Object.keys(modulesVue).map((item) => item.replace('/src/views/', '').replace('.vue', '')) return Object.keys(modulesVue).map((item) => item.replace('/src/views', '').replace('.vue', ''))
} }
Object.keys(modules).forEach((key) => { Object.keys(modules).forEach((key) => {