diff --git a/src/assets/icon/favicon_richor.png b/src/assets/icon/favicon_richor.png new file mode 100644 index 000000000..f04540d40 Binary files /dev/null and b/src/assets/icon/favicon_richor.png differ diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js index 360f9286f..6f786e015 100644 --- a/src/jmapNew/mouseController.js +++ b/src/jmapNew/mouseController.js @@ -239,6 +239,7 @@ class MouseController extends Eventful { this.$jmap.deleteCheckBox('check_box'); this.eventTarget = ''; this.deviceList = []; + store.commit('map/setSeclectDeviceList', this.deviceList); // 给store设置框选的 model } } // 通过包围盒筛选选中区域的元素 diff --git a/src/router/index.js b/src/router/index.js index 62424839b..a74967ab4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -225,6 +225,7 @@ export const projectTky = '018'; // 铁科院 export const projectHeb = '019'; // 哈盈达 export const projectDrts = '020'; // 行调实训 export const projectSdy = '021';// 苏电院 +export const projectRichor = '022';// 中航锐创 export const userTrainingPlatform = '016'; // 实训系统 // export const refereePlatform = '017'; // 裁判系统 diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index 080120e0f..b9b51babf 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -15,6 +15,7 @@ import FaviconNty from '@/assets/icon/favicon_nty.png'; import FaviconBjd from '@/assets/icon/favicon_bjd.png'; import FaviconSdy from '@/assets/icon/favicon_jdy.png'; import FaviconCgy from '@/assets/icon/favicon_cgy.png'; +import FaviconRichor from '@/assets/icon/favicon_richor.png'; import FaviconZzww from '@/assets/icon/favicon_zzww.png'; import Link_Bxkc from '@/assets/icon/link_bxkc.png'; import Link_Crsc from '@/assets/icon/link_crsc.png'; @@ -425,6 +426,15 @@ export const loginInfo = { navigationLogoWidth: '180px', navigationMarginLeft: '195px', systemType: '011' + }, + richor:{ + title: '中航锐创城市轨道交通实训平台', + loginParam: 'RICHOR', + linkIcon: FaviconRichor, + titleIcon: FaviconRichor, + navigationLogoWidth: '40px', + navigationMarginLeft: '50px', + systemType: '022' } }; @@ -466,7 +476,8 @@ export const ProjectIcon = { sdy: FaviconSdy, designsdy: FaviconSdy, cgy: FaviconCgy, - designcgy: FaviconCgy + designcgy: FaviconCgy, + richor:FaviconRichor }; export const ProjectCode = { @@ -495,10 +506,11 @@ export const ProjectCode = { sdy: 'SDY', designsdy: 'SDY', cgy: 'CGY', - designcgy: 'CGY' + designcgy: 'CGY', + richor:'RICHOR' }; export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 底部栏仅展示公司信息不展示备案号 -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']; // 实训设计平台通过项目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', 'richor']; // 实训设计平台通过项目code获取地图列表的项目 export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目 export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角版本开发基于不展示 export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角主体不展示 @@ -557,7 +569,8 @@ export const ProjectList = [ {value: 'sdy', label: '苏电院'}, {value: 'cgy', label: '成都工业'}, {value: 'wjls', label: '微机联锁'}, - {value: 'zzww', label: '郑州共赢'} + {value: 'zzww', label: '郑州共赢'}, + {value: 'richor', label: '中航锐创'} ]; export const localPackageProject = { localdesign: 'designheb', diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 8314f639e..1d1b255ac 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -1,4 +1,4 @@ -import { publicAsyncRoute, asyncRouter, constantRoutes, user, projectTrain, projectXian, projectXty, projectGzzb, projectJsxt, projectJyd, projectTky, projectHeb, superAdmin, admin, userTrainingPlatform, JSXT, projectRoute, projectDrts, projectSdy } from '@/router/index'; +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 { loginInfo } from '@/scripts/ProjectConfig'; import { getSessionStorage } from '@/utils/auth'; @@ -78,6 +78,8 @@ function resetAsyncRouter({ systemType }) { list = [...list, ...asyncRouter]; } else if (systemType == projectDrts) { list = [...list, ...asyncRouter]; + } else if (systemType == projectRichor) { + list = [...list, ...asyncRouter]; } else if (systemType == projectSdy) { if (projectRoute && projectRoute.designsdy && projectRoute.designsdy.length) { projectRoute.designheb.forEach(item => { diff --git a/src/views/thirdLogin/index.vue b/src/views/thirdLogin/index.vue index 07545fc62..67dadb760 100644 --- a/src/views/thirdLogin/index.vue +++ b/src/views/thirdLogin/index.vue @@ -9,7 +9,9 @@ import { LoginParams } from '@/utils/login'; import { thirdCountLogin } from '@/api/management/user'; import md5 from 'js-md5'; -import { setToken, getToken, setSessionStorage } from '@/utils/auth'; +import { setToken, getToken, setSessionStorage, getSessionStorage } from '@/utils/auth'; +// , ProjectLoginStyleList, VersionBaseNoShow, MainBodyNoShow, NoQrcodeList, localPackageProject, RegisterCodeList +import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig'; export default { name:'ThirdLogin', @@ -24,8 +26,14 @@ export default { return project || 'login'; } }, - mounted() { + created() { setSessionStorage('project', this.project); + const project = getSessionStorage('project'); + if (project) { + document.querySelector("link[rel*='icon']").href = loginInfo[project].linkIcon || ProjectIcon[project]; + } + }, + mounted() { const userId = this.$route.query.userId; const paccount = this.$route.query.paccount; const secret = this.$route.query.secret; @@ -35,6 +43,7 @@ export default { if (userId && paccount && secret == computeSecret) { const model = Object.assign({ parentAccount:paccount, + project:loginInfo[this.project].loginParam, account:userId, deviceCode:deviceCode }, LoginParams.LianKeTang);