修改
This commit is contained in:
parent
5b78c3daf1
commit
3fce0f3bf9
@ -64,6 +64,10 @@ export default {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
name: {
|
||||
type: String,
|
||||
default: "data",
|
||||
},
|
||||
height: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
@ -213,7 +217,7 @@ export default {
|
||||
try {
|
||||
const formData = new FormData()
|
||||
formData.append('file',file)
|
||||
formData.append('name','notice')
|
||||
formData.append('name',this.name)
|
||||
const res = await upload(formData)
|
||||
loading.close()
|
||||
return {
|
||||
|
@ -131,7 +131,7 @@
|
||||
<div class="layout-header-trigger layout-header-trigger-min">
|
||||
<el-dropdown trigger="hover" @command="avatarSelect">
|
||||
<div class="avatar">
|
||||
<el-avatar round :src="schoolboy" />
|
||||
<el-avatar round :src="userAvatar?userAvatar:schoolboy" />
|
||||
</div>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
@ -235,6 +235,7 @@
|
||||
const amendPwdRef = ref();
|
||||
|
||||
// const username = userStore?.info ? ref(userStore?.info.username) : '';
|
||||
const userAvatar = userStore.getAvatar
|
||||
|
||||
const collapsed = inject('collapsed');
|
||||
|
||||
|
@ -67,7 +67,7 @@ export const routerGenerator = (routerMap, parent?): any[] => {
|
||||
} else {
|
||||
if(item.parentId==0 && item.children.length==0) {
|
||||
currentRouter.children =[]
|
||||
if(item.target==1){
|
||||
if(item.target==1 && (/http(s)?:/.test(item.component))){
|
||||
currentRouter.children.push({
|
||||
path: item.path,
|
||||
name: names,
|
||||
@ -103,7 +103,6 @@ export const generatorDynamicRouter = (): Promise<RouteRecordRaw[]> => {
|
||||
adminMenus()
|
||||
.then((result) => {
|
||||
const routeList = routerGenerator(result);
|
||||
console.log(routeList)
|
||||
asyncImportRoute(routeList);
|
||||
resolve(routeList);
|
||||
})
|
||||
|
@ -10,7 +10,7 @@ const routeModuleList: RouteRecordRaw[] = [];
|
||||
|
||||
const modulesVue = import.meta.glob('/src/views/**/*.vue')
|
||||
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) => {
|
||||
|
Loading…
Reference in New Issue
Block a user