Merge remote-tracking branch 'origin/test'
This commit is contained in:
joylink_fanyuhong
commit
47c5168e4b
@ -38,6 +38,13 @@ export default {
|
||||
permissionManage: 'Permission',
|
||||
authorityTransferManage: 'Privilege distribution management',
|
||||
userRulesManage: 'User Rights Statistics',
|
||||
contestDataManage:'Contest data management',
|
||||
contestSubjectManage:'contest subject management',
|
||||
contestModuleManage:'contest module management',
|
||||
contestTaskManage:'contest task management',
|
||||
contestSceneManage:'contest scene management',
|
||||
contestTaskScoreManage:'contest task score management',
|
||||
contestSceneDraftManage:'contest scene draft management',
|
||||
fileManage: 'File Manage',
|
||||
frontResourceManage: 'Front-End Resource Management',
|
||||
iscsPrerecordManage: 'ISCS Advance record management',
|
||||
|
||||
@ -38,6 +38,13 @@ export default {
|
||||
permissionManage: '权限管理',
|
||||
authorityTransferManage: '权限分发管理',
|
||||
userRulesManage: '用户权限管理',
|
||||
contestDataManage:'竞赛数据管理',
|
||||
contestSubjectManage:'竞赛题目管理',
|
||||
contestModuleManage:'竞赛模块管理',
|
||||
contestTaskManage:'竞赛任务管理',
|
||||
contestSceneManage:'竞赛场景管理',
|
||||
contestTaskScoreManage:'竞赛任务评分管理',
|
||||
contestSceneDraftManage:'竞赛场景草稿管理',
|
||||
fileManage: '文件管理',
|
||||
frontResourceManage: '前端资源管理',
|
||||
iscsPrerecordManage: 'ISCS预录管理',
|
||||
|
||||
@ -220,7 +220,14 @@ const UserRulesManage = () => import('@/views/userRulesManage/index');
|
||||
const AuthorityTransfer = () => import('@/views/authorityTransfer/index');
|
||||
const CreateDistribute = () => import('@/views/authorityTransfer/create/index');
|
||||
const ThirdJumpSim = () => import('@/views/newMap/display/thirdJump');
|
||||
const TmsPage = () => import('@/views/jlmap3d/drive/sceneview/tmsPage')
|
||||
const TmsPage = () => import('@/views/jlmap3d/drive/sceneview/tmsPage');
|
||||
|
||||
const ContestSubjectManage = () => import('@/views/contestDataManage/contestSubjectManage/ContestSubjectManage');
|
||||
const ContestModuleManage = () => import('@/views/contestDataManage/contestModuleManage/ContestModuleManage');
|
||||
const ContestTaskManage = () => import('@/views/contestDataManage/contestTaskManage/ContestTaskManage');
|
||||
const ContestSceneManage = () => import('@/views/contestDataManage/contestSceneManage/ContestSceneManage');
|
||||
const ContestTaskScoreManage = () => import('@/views/contestDataManage/contestTaskScoreManage/ContestTaskScoreManage');
|
||||
const ContestSceneDraftManage = () => import('@/views/contestDataManage/contestSceneDraftManage/ContestSceneDraftManage');
|
||||
|
||||
// import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
|
||||
// import { getSessionStorage } from '@/utils/auth';
|
||||
@ -324,13 +331,13 @@ export const constantRoutes = [
|
||||
path: '/jlmap3d/lcjy',
|
||||
component: LcJy,
|
||||
hidden: true
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
path: '/tmsPage',
|
||||
component: TmsPage,
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
path: '/tmsPage',
|
||||
component: TmsPage,
|
||||
hidden: true
|
||||
},
|
||||
|
||||
{
|
||||
path: '/data2json',
|
||||
@ -2017,6 +2024,63 @@ export const asyncRouter = [
|
||||
}
|
||||
]
|
||||
},
|
||||
{ // 竞赛数据管理
|
||||
path: 'contestDataManage',
|
||||
component: TransitionIndex,
|
||||
meta: {
|
||||
i18n: 'newRouter.contestDataManage'
|
||||
},
|
||||
children: [
|
||||
{
|
||||
// 竞赛题目管理
|
||||
path: 'contestSubjectManage',
|
||||
component: ContestSubjectManage,
|
||||
meta: {
|
||||
i18n: 'newRouter.contestSubjectManage'
|
||||
}
|
||||
},
|
||||
{
|
||||
// 竞赛模块管理
|
||||
path: 'contestModuleManage',
|
||||
component: ContestModuleManage,
|
||||
meta: {
|
||||
i18n: 'newRouter.contestModuleManage'
|
||||
}
|
||||
},
|
||||
{
|
||||
// 竞赛任务管理
|
||||
path: 'contestTaskManage',
|
||||
component: ContestTaskManage,
|
||||
meta: {
|
||||
i18n: 'newRouter.contestTaskManage'
|
||||
}
|
||||
},
|
||||
{
|
||||
// 竞赛场景管理
|
||||
path: 'contestSceneManage',
|
||||
component: ContestSceneManage,
|
||||
meta: {
|
||||
i18n: 'newRouter.contestSceneManage'
|
||||
}
|
||||
},
|
||||
{
|
||||
// 竞赛任务评分管理
|
||||
path: 'contestTaskScoreManage',
|
||||
component: ContestTaskScoreManage,
|
||||
meta: {
|
||||
i18n: 'newRouter.contestTaskScoreManage'
|
||||
}
|
||||
},
|
||||
{
|
||||
// 竞赛场景草稿管理
|
||||
path: 'contestSceneDraftManage',
|
||||
component: ContestSceneDraftManage,
|
||||
meta: {
|
||||
i18n: 'newRouter.contestSceneDraftManage'
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{ // 项目数据管理
|
||||
path: 'projectDataManage',
|
||||
component: TransitionIndex,
|
||||
|
||||
@ -23,7 +23,7 @@ export function handlerUrl() {
|
||||
let OSS_URL;
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
// 开发分支
|
||||
BASE_API = 'http://192.168.3.233/rtss-server';
|
||||
BASE_API = 'http://192.168.33.233/rtss-server';
|
||||
// BASE_API = 'https://joylink.club/jlcloud';
|
||||
// BASE_API = 'https://test.joylink.club/jlcloud';
|
||||
// BASE_API = 'http://114.116.51.125/jlcloud';
|
||||
@ -36,12 +36,12 @@ export function handlerUrl() {
|
||||
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
|
||||
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
|
||||
BASE_SITE = 'https://test.joylink.club/cbtc';
|
||||
OSS_URL = 'https://192.168.3.233/oss-rtss';
|
||||
OSS_URL = 'https://192.168.33.233/oss-rtss';
|
||||
} else if (process.env.NODE_ENV === 'test' && process.env.VUE_APP_PRO === 'local-test') {
|
||||
// 本地打包测试分支
|
||||
BASE_API = 'https://192.168.3.233/rtss-server'; // api地址
|
||||
BASE_SITE = 'https://192.168.3.233/cbtc'; // 前端项目地址
|
||||
OSS_URL = 'https://192.168.3.233/oss-rtss'; // 资源地址
|
||||
BASE_API = 'https://192.168.33.233/rtss-server'; // api地址
|
||||
BASE_SITE = 'https://192.168.33.233/cbtc'; // 前端项目地址
|
||||
OSS_URL = 'https://192.168.33.233/oss-rtss'; // 资源地址
|
||||
} else if (process.env.NODE_ENV === 'test') {
|
||||
// 测试分支
|
||||
BASE_API = 'https://test.joylink.club/jlcloud';
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
<template>
|
||||
<div>竞赛模块管理</div>
|
||||
</template>
|
||||
@ -0,0 +1,3 @@
|
||||
<template>
|
||||
<div>竞赛场景草稿管理</div>
|
||||
</template>
|
||||
@ -0,0 +1,3 @@
|
||||
<template>
|
||||
<div>竞赛场景管理</div>
|
||||
</template>
|
||||
@ -0,0 +1,3 @@
|
||||
<template>
|
||||
<div>竞赛题目管理</div>
|
||||
</template>
|
||||
@ -0,0 +1,3 @@
|
||||
<template>
|
||||
<div>竞赛任务管理</div>
|
||||
</template>
|
||||
@ -0,0 +1,3 @@
|
||||
<template>
|
||||
<div>竞赛任务评分管理</div>
|
||||
</template>
|
||||
Loading…
Reference in New Issue
Block a user