Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
This commit is contained in:
fan
commit
8a29cb6288
@ -75,7 +75,7 @@ export default {
|
||||
this.loading = false;
|
||||
},
|
||||
'$route': function(val) {
|
||||
if (val.path == '/trainingPlatform/multiplayerSimulation') {
|
||||
if (val.path == '/simulation/multiplayerSimulation') {
|
||||
this.quickEntry();
|
||||
}
|
||||
}
|
||||
|
||||
@ -42,14 +42,14 @@
|
||||
<template v-for="(child,cdx) in item.children">
|
||||
<template v-if="!child.hidden">
|
||||
<template v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)">
|
||||
<el-submenu :key="cdx" :index="child.path" :show-timeout="100" popper-class="grandChildClass">
|
||||
<el-submenu :key="cdx" :index="item.path+'/'+child.path" :show-timeout="100" :hide-timeout="100" popper-class="grandChildClass">
|
||||
<template slot="title">
|
||||
<span v-if="child.meta" slot="title">{{ $t(child.meta.i18n) }}</span>
|
||||
</template>
|
||||
<template v-for="(grandchild,gdx) in child.children">
|
||||
<template v-if="!grandchild.hidden">
|
||||
<template v-if="!grandchild.children" :to="child.path+'/'+grandchild.path">
|
||||
<el-menu-item :key="gdx" :index="item.redirect ? item.redirect : (child.path+'/'+grandchild.path)">
|
||||
<el-menu-item :key="gdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path+'/'+grandchild.path)">
|
||||
<span
|
||||
v-if="grandchild.meta"
|
||||
slot="title"
|
||||
@ -57,11 +57,11 @@
|
||||
</el-menu-item>
|
||||
</template>
|
||||
<template v-else :to="child.path+'/'+grandchild.path">
|
||||
<el-submenu v-for="(mgChild,mgdx) in grandchild.children" :key="mgdx" :index="mgChild.path" :show-timeout="100">
|
||||
<el-submenu v-for="(mgChild,mgdx) in grandchild.children" :key="mgChild" :index="item.redirect ? item.redirect : (item.path+'/'+child.path+'/'+grandchild.path+'/'+mgChild.path)" :show-timeout="100" :hide-timeout="100">
|
||||
<template slot="title">
|
||||
<span v-if="mgChild.meta" slot="title">{{ $t(mgChild.meta.i18n) }}</span>
|
||||
</template>
|
||||
<el-menu-item :key="mgdx" :index="item.redirect ? item.redirect : (child.path+'/'+grandchild.path + '/' + mgChild.path)">
|
||||
<el-menu-item :key="mgdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path+'/'+grandchild.path + '/' + mgChild.path)">
|
||||
<span
|
||||
v-if="mgChild.meta"
|
||||
slot="title"
|
||||
|
||||
@ -1544,7 +1544,7 @@ export const asyncRouter = [
|
||||
]
|
||||
},
|
||||
{ // 新路由-仿真菜单
|
||||
path: '/trainingPlatform',
|
||||
path: '/simulation',
|
||||
component: Layout,
|
||||
meta: {
|
||||
i18n: 'newRouter.simulation',
|
||||
@ -1552,7 +1552,7 @@ export const asyncRouter = [
|
||||
},
|
||||
children: [
|
||||
{ // 仿真
|
||||
path: '',
|
||||
path: 'simulationIndex',
|
||||
component: TrainingPlatform,
|
||||
// route: { path: '/simulation/trainingPlatform/detail' },
|
||||
meta: {
|
||||
@ -1585,7 +1585,7 @@ export const asyncRouter = [
|
||||
]
|
||||
},
|
||||
{ // 新路由-教学管理菜单
|
||||
path: '/teachingManagement',
|
||||
path: '/info',
|
||||
component: Layout,
|
||||
meta: {
|
||||
i18n: 'newRouter.teachingManagement',
|
||||
@ -1593,41 +1593,19 @@ export const asyncRouter = [
|
||||
},
|
||||
children: [
|
||||
{ // 班级管理
|
||||
path: 'classroom',
|
||||
component: TeachHome,
|
||||
path: 'organization',
|
||||
component: OrganizationManage,
|
||||
meta: {
|
||||
i18n: 'newRouter.classroom'
|
||||
}
|
||||
},
|
||||
{ // 学生管理
|
||||
path: 'student',
|
||||
// component: Student,
|
||||
meta: {
|
||||
i18n: 'newRouter.student'
|
||||
}
|
||||
},
|
||||
{ // 理论题目管理
|
||||
path: 'theory',
|
||||
// component: Theory,
|
||||
meta: {
|
||||
i18n: 'newRouter.theory'
|
||||
}
|
||||
},
|
||||
{ // 实训教学管理
|
||||
path: 'training',
|
||||
// component: Training,
|
||||
meta: {
|
||||
i18n: 'newRouter.training'
|
||||
}
|
||||
},
|
||||
{ // 考试管理
|
||||
path: 'exam',
|
||||
component: PublishExamRule,
|
||||
meta: {
|
||||
i18n: 'newRouter.exam'
|
||||
}
|
||||
i18n: 'newRouter.teachingManagement'
|
||||
},
|
||||
children: [
|
||||
{
|
||||
path:'classManage',
|
||||
component: OrgClassManage,
|
||||
hidden: true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
]
|
||||
},
|
||||
{ // 新路由-线路设计
|
||||
@ -1683,7 +1661,7 @@ export const asyncRouter = [
|
||||
},
|
||||
children: [
|
||||
{ // 系统数据管理
|
||||
path: '/systemDataManagement',
|
||||
path: 'systemDataManagement',
|
||||
component: TransitionIndex,
|
||||
meta: {
|
||||
i18n: 'newRouter.SystemDataManagement'
|
||||
@ -1713,7 +1691,7 @@ export const asyncRouter = [
|
||||
]
|
||||
},
|
||||
{ // 在线信息管理
|
||||
path: '/OnlineInformationManagement',
|
||||
path: 'OnlineInformationManagement',
|
||||
component: TransitionIndex,
|
||||
meta: {
|
||||
i18n: 'newRouter.OnlineInformationManagement'
|
||||
@ -1776,7 +1754,7 @@ export const asyncRouter = [
|
||||
children: [
|
||||
{
|
||||
// 线路类型管理
|
||||
path: 'companyManage',
|
||||
path: 'lineTypeManage',
|
||||
component: configLine,
|
||||
meta: {
|
||||
i18n: 'newRouter.lineTypeManage'
|
||||
@ -1784,7 +1762,7 @@ export const asyncRouter = [
|
||||
},
|
||||
{
|
||||
// 线路数据管理
|
||||
path: 'companyManage',
|
||||
path: 'lineDataManage',
|
||||
component: Temporary,
|
||||
meta: {
|
||||
i18n: 'newRouter.lineDataManage'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user