Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly

This commit is contained in:
Yuan 2022-10-12 14:43:44 +08:00
commit 5210a97e2d
4 changed files with 50 additions and 10 deletions

View File

@ -40,5 +40,8 @@ export default {
userRulesManage: 'User Rights Statistics',
fileManage: 'File Manage',
frontResourceManage: 'Front-End Resource Management',
iscsPrerecordManage: 'ISCS Advance record management'
iscsPrerecordManage: 'ISCS Advance record management',
XRVTI: 'Xi\'an Railway Vocational & Technical Institute',
GEMVC: 'Guizhou Equipment Manufacturing Vocational College',
JVCOEAI: 'Jiangsu Vocational College Of Electronics And Information'
};

View File

@ -40,5 +40,8 @@ export default {
userRulesManage: '用户权限管理',
fileManage: '文件管理',
frontResourceManage: '前端资源管理',
iscsPrerecordManage: 'ISCS预录管理'
iscsPrerecordManage: 'ISCS预录管理',
XRVTI: '西安铁路职业技术学院',
GEMVC: '贵州装备制造职业学院',
JVCOEAI: '江苏电子信息职业学院'
};

View File

@ -73,9 +73,17 @@
</template>
</el-submenu>
</template>
<template v-else :to="item.path+'/'+child.path">
<template v-else>
<div v-if="child.target" :key="child.target + cdx" class="targetDiv">
<!-- 案例跳转 -->
<a
:href="child.target"
target="_blank"
style="width: 100%; height: 100%; padding: 0 10px; display: block;"
>{{ $t(child.meta.i18n) }}</a>
</div>
<!-- <el-menu-item :key="cdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path)" :route="(child.route && child.route()) ? child.route() : null"> -->
<el-menu-item :key="cdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path)">
<el-menu-item v-else :key="cdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path)">
<span v-if="child.meta" slot="title">{{ $t(child.meta.i18n) }}</span>
</el-menu-item>
</template>
@ -237,4 +245,13 @@ export default {
/deep/ .grandChildClass {
left: -210px !important;
}
.targetDiv {
height: 36px;
line-height: 36px;
color: #fff;
font-size: 14px;
}
.targetDiv :hover {
background-color: #434A50;
}
</style>

View File

@ -218,7 +218,7 @@ const IscsDeviceManage = () => import('@/views/system/iscsDeviceManage');
const IscsResourcesManage = () => import('@/views/system/iscsResourcesManage');
const PisScreen = () => import('@/views/pis/index');
const Case = () => import('@/views/case/index');
const TransitionIndex = () => import('@/views/temporary/transitionIndex');
const Temporary = () => import('@/views/temporary/index');
@ -1665,10 +1665,27 @@ export const asyncRouter = [
},
children: [
{
path: 'index',
component: Case,
path: 'XRVTI',
target: 'https://joylink.club/oss/portal/cases/西安铁路职业技术学院.pdf',
// component: Case,
meta: {
i18n: 'newRouter.case'
i18n: 'newRouter.XRVTI'
}
},
{
path: 'GEMVC',
target: 'https://joylink.club/oss/portal/cases/贵州装备制造职业学院机电技术专业实训室建设.pdf',
// component: Case,
meta: {
i18n: 'newRouter.GEMVC'
}
},
{
path: 'JVCOEAI',
target: 'https://joylink.club/oss/portal/cases/江苏电子信息职业学院-城市轨道交通行车组织综合实训室.pdf',
// component: Case,
meta: {
i18n: 'newRouter.JVCOEAI'
}
}
]
@ -1874,7 +1891,7 @@ export const asyncRouter = [
{
// 项目设备管理
path: 'projectDeviceManage',
component: Temporary,
component: DeviceManage,
meta: {
i18n: 'newRouter.projectDeviceManage'
}
@ -1936,7 +1953,7 @@ export const asyncRouter = [
meta: {
i18n: 'newRouter.iscsPrerecordManage'
}
},
}
]
}
]