添加中航锐创（实验室登录）

src/router/index.js

@@ -226,6 +226,7 @@ export const projectHeb = '019'; 		// 哈盈达
 export const projectDrts = '020'; 		// 行调实训
 export const projectSdy = '021';// 苏电院
 export const projectRichor = '022';// 中航锐创
+export const projectRichorJoint = '023'; // 中航锐创（实训室）
 
 export const userTrainingPlatform = '016'; // 实训系统
 // export const refereePlatform = '017'; // 裁判系统
@@ -1463,6 +1464,27 @@ export const projectRoute = {
                 }
             ]
         }
+    ],
+    designrichorjoint: [
+        { // 系统管理
+            path: '/system',
+            component: Layout,
+            merge: true,
+            mergeIndex: 4,
+            meta: {
+                i18n: 'router.systemManage',
+                roles: [admin]
+            },
+            children: [
+                {
+                    path: 'deviceManage',
+                    component: DeviceManage,
+                    meta: {
+                        i18n: 'router.deviceManage'
+                    }
+                }
+            ]
+        }
     ]
 };
 const createRouter = () => new Router({

src/scripts/ProjectConfig.js

@@ -46,14 +46,14 @@ export const loginInfo = {
         systemType: '011'
     },
     zzwwtest:{
-      title: '共赢列车仿真驾驶系统',
+        title: '共赢列车仿真驾驶系统',
-      loginPath: '/login?project=zzwwtest',
+        loginPath: '/login?project=zzwwtest',
-      loginParam: 'ZZWWTEST',
+        loginParam: 'ZZWWTEST',
-      loginTitle: '空串',
+        loginTitle: '空串',
-      logoWidth: '140px',
+        logoWidth: '140px',
-      navigationLogoWidth: '120px',
+        navigationLogoWidth: '120px',
-      navigationMarginLeft: '140px',
+        navigationMarginLeft: '140px',
-      systemType: '011'
+        systemType: '011'
     },
     bjd: {
         title: '城市轨道交通列车运行智慧辅助系统',
@@ -439,6 +439,7 @@ export const loginInfo = {
     },
     richor:{
         title: '中航锐创城市轨道交通实训平台',
+        loginPath: '/login?project=richor',
         loginParam: 'RICHOR',
         bottomColumn: '中航锐创(北京)科技发展有限公司 联系电话:4000500081',
         linkIcon: FaviconRichor,
@@ -446,6 +447,28 @@ export const loginInfo = {
         navigationLogoWidth: '40px',
         navigationMarginLeft: '50px',
         systemType: '022'
+    },
+    designrichorjoint: {
+        title: '中航锐创城市轨道交通设计平台',
+        loginPath: '/design/login?project=richorjoint',
+        loginParam: 'RICHOR_JOINT',
+        bottomColumn: '中航锐创(北京)科技发展有限公司 联系电话:4000500081',
+        linkIcon: FaviconRichor,
+        titleIcon: FaviconRichor,
+        navigationLogoWidth: '40px',
+        navigationMarginLeft: '50px',
+        systemType: '023'
+    },
+    richorjoint: {
+        title: '中航锐创城市轨道交通实训平台',
+        loginPath: '/login?project=richorjoint',
+        loginParam: 'RICHOR_JOINT',
+        bottomColumn: '中航锐创(北京)科技发展有限公司 联系电话:4000500081',
+        linkIcon: FaviconRichor,
+        titleIcon: FaviconRichor,
+        navigationLogoWidth: '40px',
+        navigationMarginLeft: '50px',
+        systemType: '023'
     }
 };
 
@@ -489,7 +512,9 @@ export const ProjectIcon = {
     designsdy: FaviconSdy,
     cgy: FaviconCgy,
     designcgy: FaviconCgy,
-    richor:FaviconRichor
+    richor:FaviconRichor,
+    richorjoint: FaviconRichor,
+    designrichorjoint: FaviconRichor
 };
 
 export const ProjectCode = {
@@ -520,10 +545,12 @@ export const ProjectCode = {
     designsdy: 'SDY',
     cgy: 'CGY',
     designcgy: 'CGY',
-    richor:'RICHOR'
+    richor:'RICHOR',
+    richorjoint: 'RICHOR_JOINT',
+    designrichorjoint: 'RICHOR_JOINT'
 };
-export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor']; // 底部栏仅展示公司信息不展示备案号
+export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor', 'richorjoint', 'designrichorjoint']; // 底部栏仅展示公司信息不展示备案号
-export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww','zzwwtest', 'richor']; // 实训设计平台通过项目code获取地图列表的项目
+export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'richor', 'richorjoint', 'designrichorjoint']; // 实训设计平台通过项目code获取地图列表的项目
 export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目
 export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt']; // 登录页右下角版本开发基于不展示
 export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt']; // 登录页右下角主体不展示
@@ -564,9 +591,11 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台
     ntyl: '/design/login?project=ntyl',
     designntyl: '/login?project=ntyl',
     ntyc: '/design/login?project=ntyc',
-    designntyc: '/login?project=ntyc'
+    designntyc: '/login?project=ntyc',
     // cgy: '/design/login?project=cgy',
     // designcgy: '/login?project=cgy'
+    richorjoint: '/design/login?project=richorjoint',
+    designrichorjoint: '/login?project=richorjoint'
 };
 export const ProjectList = [
     {value:'xty', label:'西铁院'},
@@ -584,7 +613,8 @@ export const ProjectList = [
     {value: 'wjls', label: '微机联锁'},
     {value: 'zzww', label: '郑州共赢'},
     {value: 'zzwwtest', label: '郑州共赢考试'},
-    {value: 'richor', label: '中航锐创'}
+    {value: 'richor', label: '中航锐创'},
+    {value: 'richor_joint', label: '中航锐创（实训室）'}
 ];
 export const localPackageProject = {
     localdesign: 'designheb',

src/store/modules/permission.js

@@ -1,4 +1,4 @@
-import { publicAsyncRoute, asyncRouter, constantRoutes, user, projectTrain, projectXian, projectXty, projectGzzb, projectJsxt, projectJyd, projectRichor, projectTky, projectHeb, superAdmin, admin, userTrainingPlatform, JSXT, projectRoute, projectDrts, projectSdy } from '@/router/index';
+import { publicAsyncRoute, asyncRouter, constantRoutes, user, projectTrain, projectXian, projectXty, projectGzzb, projectJsxt, projectRichorJoint, projectJyd, projectRichor, projectTky, projectHeb, superAdmin, admin, userTrainingPlatform, JSXT, projectRoute, projectDrts, projectSdy } from '@/router/index';
 import { loginInfo } from '@/scripts/ProjectConfig';
 import { getSessionStorage } from '@/utils/auth';
 
@@ -82,7 +82,16 @@ function resetAsyncRouter({ systemType }) {
         list = [...list, ...asyncRouter];
     } else if (systemType == projectSdy) {
         if (projectRoute && projectRoute.designsdy && projectRoute.designsdy.length) {
-            projectRoute.designheb.forEach(item => {
+            projectRoute.designsdy.forEach(item => {
+                if (item.merge) {
+                    asyncRouter[item.mergeIndex].children = [...asyncRouter[item.mergeIndex].children, ...item.children];
+                } else { list.push(item); }
+            });
+        }
+        list = [...list, ...asyncRouter];
+    } else if (systemType == projectRichorJoint) {
+        if (projectRoute && projectRoute.designrichorjoint && projectRoute.designrichorjoint.length) {
+            projectRoute.designrichorjoint.forEach(item => {
                 if (item.merge) {
                     asyncRouter[item.mergeIndex].children = [...asyncRouter[item.mergeIndex].children, ...item.children];
                 } else { list.push(item); }

src/utils/baseUrl.js

@@ -2,10 +2,10 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
         // BASE_API = 'http://192.168.2.175:9000'; // 旭强 有线
-        // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
+        BASE_API = 'http://192.168.8.167:9000'; // 旭强 无线
         // BASE_API = 'http://192.168.2.183:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';

src/views/system/deviceManage/index.vue

@@ -38,11 +38,13 @@ export default {
                 pageIndex: 'pageNum'
             },
             deviceTypeList:ConstConfig.ConstSelect.projectDeviceTypeList,
-            projectList: [{label:'西铁院', value: 'XTY'}, {label: '贵州装备', value:'GZB'}, {label: '哈尔滨', value:'HEB'}, {label: '苏电院', value:'SDY'}],
+            projectList: [{label:'西铁院', value: 'XTY'}, {label: '贵州装备', value:'GZB'}, {label: '哈尔滨', value:'HEB'}, {label: '苏电院', value:'SDY'}, { label: '中航锐创（实训室）', value: 'RICHOR_JOINT' }],
             projectMap: {
                 designxty: 'XTY',
                 designgzb: 'GZB',
-                designheb: 'HEB'
+                designheb: 'HEB',
+                designsdy: 'SDY',
+                designrichorjoint: 'RICHOR_JOINT'
             },
             queryForm: {
                 labelWidth: '120px',
@@ -196,7 +198,7 @@ export default {
         },
         getPath(index, row) {
             let url = '';
-            url = `${window.location.protocol}//${window.location.host}/cbtc/login?project=${row.project.toLowerCase()}&projectDevice=${row.code}&type=${row.type}`;
+            url = `${window.location.protocol}//${window.location.host}/cbtc/login?project=${row.project.toLowerCase().replace(/_/, '')}&projectDevice=${row.code}&type=${row.type}`;
             this.url = url;
             this.$messageBox();
             this.$confirm(`登录路径：${url}`, '登录路径', {