fix: bugs
This commit is contained in:
parent
4c515318af
commit
8957b77d55
@ -9,7 +9,7 @@
|
|||||||
<el-icon>
|
<el-icon>
|
||||||
<AppIcon v-if="menu.meta && menu.meta.icon" :iconName="menuIcon" class="sidebar-icon" />
|
<AppIcon v-if="menu.meta && menu.meta.icon" :iconName="menuIcon" class="sidebar-icon" />
|
||||||
</el-icon>
|
</el-icon>
|
||||||
<span>{{ menu.meta?.title as string }}</span>
|
<span>{{ $t(menu.meta?.title as string) }}</span>
|
||||||
</template>
|
</template>
|
||||||
<sidebar-item
|
<sidebar-item
|
||||||
v-hasPermission="child.meta?.permission"
|
v-hasPermission="child.meta?.permission"
|
||||||
@ -29,7 +29,7 @@
|
|||||||
>
|
>
|
||||||
<template #title>
|
<template #title>
|
||||||
<AppIcon v-if="menu.meta && menu.meta.icon" :iconName="menuIcon" class="sidebar-icon" />
|
<AppIcon v-if="menu.meta && menu.meta.icon" :iconName="menuIcon" class="sidebar-icon" />
|
||||||
<span v-if="menu.meta && menu.meta.title">{{ menu.meta.title }}</span>
|
<span v-if="menu.meta && menu.meta.title">{{ $t(menu.meta.title) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-menu-item>
|
</el-menu-item>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
<AppIcon :iconName="menu.meta ? (menu.meta.icon as string) : '404'" />
|
<AppIcon :iconName="menu.meta ? (menu.meta.icon as string) : '404'" />
|
||||||
</div> -->
|
</div> -->
|
||||||
<div class="title">
|
<div class="title">
|
||||||
{{ menu.meta?.title }}
|
{{ $t(menu.meta?.title) }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@ -1,11 +1,10 @@
|
|||||||
import Layout from '@/layout/layout-template/DetailLayout.vue'
|
import Layout from '@/layout/layout-template/DetailLayout.vue'
|
||||||
import { ComplexPermission } from '@/utils/permission/type'
|
import { ComplexPermission } from '@/utils/permission/type'
|
||||||
import { t } from '@/locales'
|
|
||||||
|
|
||||||
const applicationRouter = {
|
const applicationRouter = {
|
||||||
path: '/application',
|
path: '/application',
|
||||||
name: 'application',
|
name: 'application',
|
||||||
meta: { title: t('views.application.title'), permission: 'APPLICATION:READ' },
|
meta: { title: 'views.application.title', permission: 'APPLICATION:READ' },
|
||||||
redirect: '/application',
|
redirect: '/application',
|
||||||
component: () => import('@/layout/layout-template/AppLayout.vue'),
|
component: () => import('@/layout/layout-template/AppLayout.vue'),
|
||||||
children: [
|
children: [
|
||||||
@ -28,7 +27,7 @@ const applicationRouter = {
|
|||||||
meta: {
|
meta: {
|
||||||
icon: 'app-all-menu',
|
icon: 'app-all-menu',
|
||||||
iconActive: 'app-all-menu-active',
|
iconActive: 'app-all-menu-active',
|
||||||
title: t('views.applicationOverview.title'),
|
title: 'views.applicationOverview.title',
|
||||||
active: 'overview',
|
active: 'overview',
|
||||||
parentPath: '/application/:id/:type',
|
parentPath: '/application/:id/:type',
|
||||||
parentName: 'ApplicationDetail'
|
parentName: 'ApplicationDetail'
|
||||||
@ -41,7 +40,7 @@ const applicationRouter = {
|
|||||||
meta: {
|
meta: {
|
||||||
icon: 'app-setting',
|
icon: 'app-setting',
|
||||||
iconActive: 'app-setting-active',
|
iconActive: 'app-setting-active',
|
||||||
title: t('common.setting'),
|
title: 'common.setting',
|
||||||
active: 'setting',
|
active: 'setting',
|
||||||
parentPath: '/application/:id/:type',
|
parentPath: '/application/:id/:type',
|
||||||
parentName: 'ApplicationDetail'
|
parentName: 'ApplicationDetail'
|
||||||
@ -54,7 +53,7 @@ const applicationRouter = {
|
|||||||
meta: {
|
meta: {
|
||||||
icon: 'app-access',
|
icon: 'app-access',
|
||||||
iconActive: 'app-access-active',
|
iconActive: 'app-access-active',
|
||||||
title: t('views.application.applicationAccess.title'),
|
title: 'views.application.applicationAccess.title',
|
||||||
active: 'access',
|
active: 'access',
|
||||||
parentPath: '/application/:id/:type',
|
parentPath: '/application/:id/:type',
|
||||||
parentName: 'ApplicationDetail',
|
parentName: 'ApplicationDetail',
|
||||||
@ -67,7 +66,7 @@ const applicationRouter = {
|
|||||||
name: 'AppHitTest',
|
name: 'AppHitTest',
|
||||||
meta: {
|
meta: {
|
||||||
icon: 'app-hit-test',
|
icon: 'app-hit-test',
|
||||||
title: t('views.application.hitTest.title'),
|
title: 'views.application.hitTest.title',
|
||||||
active: 'hit-test',
|
active: 'hit-test',
|
||||||
parentPath: '/application/:id/:type',
|
parentPath: '/application/:id/:type',
|
||||||
parentName: 'ApplicationDetail'
|
parentName: 'ApplicationDetail'
|
||||||
@ -80,7 +79,7 @@ const applicationRouter = {
|
|||||||
meta: {
|
meta: {
|
||||||
icon: 'app-document',
|
icon: 'app-document',
|
||||||
iconActive: 'app-document-active',
|
iconActive: 'app-document-active',
|
||||||
title: t('views.log.title'),
|
title: 'views.log.title',
|
||||||
active: 'log',
|
active: 'log',
|
||||||
parentPath: '/application/:id/:type',
|
parentPath: '/application/:id/:type',
|
||||||
parentName: 'ApplicationDetail'
|
parentName: 'ApplicationDetail'
|
||||||
|
|||||||
@ -1,9 +1,8 @@
|
|||||||
import Layout from '@/layout/layout-template/DetailLayout.vue'
|
import Layout from '@/layout/layout-template/DetailLayout.vue'
|
||||||
import { t } from '@/locales'
|
|
||||||
const datasetRouter = {
|
const datasetRouter = {
|
||||||
path: '/dataset',
|
path: '/dataset',
|
||||||
name: 'dataset',
|
name: 'dataset',
|
||||||
meta: { title: t('views.dataset.title'), permission: 'DATASET:READ' },
|
meta: { title: 'views.dataset.title', permission: 'DATASET:READ' },
|
||||||
component: () => import('@/layout/layout-template/AppLayout.vue'),
|
component: () => import('@/layout/layout-template/AppLayout.vue'),
|
||||||
redirect: '/dataset',
|
redirect: '/dataset',
|
||||||
children: [
|
children: [
|
||||||
@ -23,7 +22,7 @@ const datasetRouter = {
|
|||||||
{
|
{
|
||||||
path: '/dataset/:id',
|
path: '/dataset/:id',
|
||||||
name: 'DatasetDetail',
|
name: 'DatasetDetail',
|
||||||
meta: { title: t('common.fileUpload.document'), activeMenu: '/dataset' },
|
meta: { title: 'common.fileUpload.document', activeMenu: '/dataset' },
|
||||||
component: Layout,
|
component: Layout,
|
||||||
hidden: true,
|
hidden: true,
|
||||||
children: [
|
children: [
|
||||||
@ -33,7 +32,7 @@ const datasetRouter = {
|
|||||||
meta: {
|
meta: {
|
||||||
icon: 'app-document',
|
icon: 'app-document',
|
||||||
iconActive: 'app-document-active',
|
iconActive: 'app-document-active',
|
||||||
title: t('common.fileUpload.document'),
|
title: 'common.fileUpload.document',
|
||||||
active: 'document',
|
active: 'document',
|
||||||
parentPath: '/dataset/:id',
|
parentPath: '/dataset/:id',
|
||||||
parentName: 'DatasetDetail'
|
parentName: 'DatasetDetail'
|
||||||
@ -46,7 +45,7 @@ const datasetRouter = {
|
|||||||
meta: {
|
meta: {
|
||||||
icon: 'app-problems',
|
icon: 'app-problems',
|
||||||
iconActive: 'QuestionFilled',
|
iconActive: 'QuestionFilled',
|
||||||
title: t('views.problem.title'),
|
title: 'views.problem.title',
|
||||||
active: 'problem',
|
active: 'problem',
|
||||||
parentPath: '/dataset/:id',
|
parentPath: '/dataset/:id',
|
||||||
parentName: 'DatasetDetail'
|
parentName: 'DatasetDetail'
|
||||||
@ -58,7 +57,7 @@ const datasetRouter = {
|
|||||||
name: 'DatasetHitTest',
|
name: 'DatasetHitTest',
|
||||||
meta: {
|
meta: {
|
||||||
icon: 'app-hit-test',
|
icon: 'app-hit-test',
|
||||||
title: t('views.application.hitTest.title'),
|
title: 'views.application.hitTest.title',
|
||||||
active: 'hit-test',
|
active: 'hit-test',
|
||||||
parentPath: '/dataset/:id',
|
parentPath: '/dataset/:id',
|
||||||
parentName: 'DatasetDetail'
|
parentName: 'DatasetDetail'
|
||||||
@ -71,7 +70,7 @@ const datasetRouter = {
|
|||||||
meta: {
|
meta: {
|
||||||
icon: 'app-setting',
|
icon: 'app-setting',
|
||||||
iconActive: 'app-setting-active',
|
iconActive: 'app-setting-active',
|
||||||
title: t('common.setting'),
|
title: 'common.setting',
|
||||||
active: 'setting',
|
active: 'setting',
|
||||||
parentPath: '/dataset/:id',
|
parentPath: '/dataset/:id',
|
||||||
parentName: 'DatasetDetail'
|
parentName: 'DatasetDetail'
|
||||||
|
|||||||
@ -1,8 +1,7 @@
|
|||||||
import { t } from '@/locales'
|
|
||||||
const functionLibRouter = {
|
const functionLibRouter = {
|
||||||
path: '/function-lib',
|
path: '/function-lib',
|
||||||
name: 'function_lib',
|
name: 'function_lib',
|
||||||
meta: { title: t('views.functionLib.title'), permission: 'APPLICATION:READ' },
|
meta: { title: 'views.functionLib.title', permission: 'APPLICATION:READ' },
|
||||||
redirect: '/function-lib',
|
redirect: '/function-lib',
|
||||||
component: () => import('@/layout/layout-template/AppLayout.vue'),
|
component: () => import('@/layout/layout-template/AppLayout.vue'),
|
||||||
children: [
|
children: [
|
||||||
|
|||||||
@ -1,11 +1,10 @@
|
|||||||
import { hasPermission } from '@/utils/permission/index'
|
import { hasPermission } from '@/utils/permission/index'
|
||||||
import Layout from '@/layout/layout-template/SystemLayout.vue'
|
import Layout from '@/layout/layout-template/SystemLayout.vue'
|
||||||
import { Role, ComplexPermission } from '@/utils/permission/type'
|
import { Role, ComplexPermission } from '@/utils/permission/type'
|
||||||
import { t } from '@/locales'
|
|
||||||
const settingRouter = {
|
const settingRouter = {
|
||||||
path: '/setting',
|
path: '/setting',
|
||||||
name: 'setting',
|
name: 'setting',
|
||||||
meta: { icon: 'Setting', title: t('views.system.title'), permission: 'SETTING:READ' },
|
meta: { icon: 'Setting', title: 'views.system.title', permission: 'SETTING:READ' },
|
||||||
redirect: () => {
|
redirect: () => {
|
||||||
if (hasPermission(new Role('ADMIN'), 'AND')) {
|
if (hasPermission(new Role('ADMIN'), 'AND')) {
|
||||||
return '/user'
|
return '/user'
|
||||||
@ -20,7 +19,7 @@ const settingRouter = {
|
|||||||
meta: {
|
meta: {
|
||||||
icon: 'User',
|
icon: 'User',
|
||||||
iconActive: 'UserFilled',
|
iconActive: 'UserFilled',
|
||||||
title: t('views.user.title'),
|
title: 'views.user.title',
|
||||||
activeMenu: '/setting',
|
activeMenu: '/setting',
|
||||||
parentPath: '/setting',
|
parentPath: '/setting',
|
||||||
parentName: 'setting',
|
parentName: 'setting',
|
||||||
@ -34,7 +33,7 @@ const settingRouter = {
|
|||||||
meta: {
|
meta: {
|
||||||
icon: 'app-team',
|
icon: 'app-team',
|
||||||
iconActive: 'app-team-active',
|
iconActive: 'app-team-active',
|
||||||
title: t('views.team.title'),
|
title: 'views.team.title',
|
||||||
activeMenu: '/setting',
|
activeMenu: '/setting',
|
||||||
parentPath: '/setting',
|
parentPath: '/setting',
|
||||||
parentName: 'setting'
|
parentName: 'setting'
|
||||||
@ -47,7 +46,7 @@ const settingRouter = {
|
|||||||
meta: {
|
meta: {
|
||||||
icon: 'app-template',
|
icon: 'app-template',
|
||||||
iconActive: 'app-template-active',
|
iconActive: 'app-template-active',
|
||||||
title: t('views.template.title'),
|
title: 'views.template.title',
|
||||||
activeMenu: '/setting',
|
activeMenu: '/setting',
|
||||||
parentPath: '/setting',
|
parentPath: '/setting',
|
||||||
parentName: 'setting'
|
parentName: 'setting'
|
||||||
@ -60,7 +59,7 @@ const settingRouter = {
|
|||||||
meta: {
|
meta: {
|
||||||
icon: 'app-setting',
|
icon: 'app-setting',
|
||||||
iconActive: 'app-setting-active',
|
iconActive: 'app-setting-active',
|
||||||
title: t('common.setting'),
|
title: 'common.setting',
|
||||||
activeMenu: '/setting',
|
activeMenu: '/setting',
|
||||||
parentPath: '/setting',
|
parentPath: '/setting',
|
||||||
parentName: 'setting',
|
parentName: 'setting',
|
||||||
@ -71,7 +70,7 @@ const settingRouter = {
|
|||||||
path: '/system/theme',
|
path: '/system/theme',
|
||||||
name: 'theme',
|
name: 'theme',
|
||||||
meta: {
|
meta: {
|
||||||
title: t('views.system.theme.title'),
|
title: 'views.system.theme.title',
|
||||||
activeMenu: '/setting',
|
activeMenu: '/setting',
|
||||||
parentPath: '/setting',
|
parentPath: '/setting',
|
||||||
parentName: 'setting',
|
parentName: 'setting',
|
||||||
@ -83,7 +82,7 @@ const settingRouter = {
|
|||||||
path: '/system/authentication',
|
path: '/system/authentication',
|
||||||
name: 'authentication',
|
name: 'authentication',
|
||||||
meta: {
|
meta: {
|
||||||
title: t('views.system.authentication.title'),
|
title: 'views.system.authentication.title',
|
||||||
activeMenu: '/setting',
|
activeMenu: '/setting',
|
||||||
parentPath: '/setting',
|
parentPath: '/setting',
|
||||||
parentName: 'setting',
|
parentName: 'setting',
|
||||||
@ -95,7 +94,7 @@ const settingRouter = {
|
|||||||
path: '/system/email',
|
path: '/system/email',
|
||||||
name: 'email',
|
name: 'email',
|
||||||
meta: {
|
meta: {
|
||||||
title: t('views.system.email.title'),
|
title: 'views.system.email.title',
|
||||||
activeMenu: '/setting',
|
activeMenu: '/setting',
|
||||||
parentPath: '/setting',
|
parentPath: '/setting',
|
||||||
parentName: 'setting',
|
parentName: 'setting',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user