joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test'

Browse Source
This commit is contained in:
fan 2023-05-26 17:18:59 +08:00
commit f4e27a6e31
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/layout/components/Navbar.vue
View File

@ -111,6 +111,7 @@
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import SystemTitle from './Title'; import SystemTitle from './Title';
import {getSessionStorage } from '@/utils/auth'; import {getSessionStorage } from '@/utils/auth';
import { ThirdLoginList } from '@/scripts/ProjectConfig';
export default { export default {
components: { components: {
@ -130,7 +131,7 @@ export default {
'routers' 'routers'
]), ]),
thirdLogin() { thirdLogin() {
return this.$store.state.user.thirdLogin; return ThirdLoginList.includes(getSessionStorage('project'));
}, },
username() { username() {
return this.$store.state.user.nickname; return this.$store.state.user.nickname;

2
src/scripts/ProjectConfig.js
View File

@ -891,7 +891,7 @@
// jjjlm: 'JJJLM' // jjjlm: 'JJJLM'
// }; // };
// /** 嵌入第三方平台 导航栏右上角 清空 */ // /** 嵌入第三方平台 导航栏右上角 清空 */
// export const ThirdLoginList = ['richor', 'designrichor', 'richorygy', 'designrichorygy', 'richorcxjs', 'designrichorcxjs']; export const ThirdLoginList = ['richor', 'designrichor', 'richorygy', 'designrichorygy', 'richorcxjs', 'designrichorcxjs', 'richorgscm'];
// /** 底部栏仅展示公司信息不展示备案号 */ // /** 底部栏仅展示公司信息不展示备案号 */
// export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', // export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls',
// 'designhls', 'hyd', 'designhyd', 'hydrailway', 'designhydrailway', 'cgy', 'designcgy', 'richor', 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo', 'richorygy', // 'designhls', 'hyd', 'designhyd', 'hydrailway', 'designhydrailway', 'cgy', 'designcgy', 'richor', 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo', 'richorygy',