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

北信坤成页面调整&&综合演练会话调整

Browse Source
This commit is contained in:
fan 2020-07-14 15:32:18 +08:00
parent 23d3663e0e
commit 0db415d5ca
7 changed files with 63 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/icon/favicon_bxkc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 79 KiB

BIN
src/assets/icon/link_bxkc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 47 KiB

78
src/scripts/ProjectConfig.js
View File

@ -8,6 +8,8 @@ import FaviconJyd from '@/assets/icon/favicon_jyd.png';
import Bottom_Jyd from '@/assets/icon/bottom_jyd.png';
import Link_Jyd from '@/assets/icon/link_jyd.png';
import FaviconTky from '@/assets/icon/favicon_tky.png';
import FaviconBxkc from '@/assets/icon/favicon_bxkc.png';
import Link_Bxkc from '@/assets/icon/link_bxkc.png';
// import { LoginParams } from '@/utils/login';
// title:页面title; loginPath:退出登录跳转路径; loginParam:登录接口参数project;loginTitle:登录页左上角title；logoWidth：登录页左上角logo宽度；
@ -154,6 +156,30 @@ export const loginInfo = {
loginParam: 'DEFAULT',
navigationLogoWidth: '75px',
navigationMarginLeft: '90px'
},
bxkc: {
title: '城市轨道交通实训平台',
loginPath: '/login?project=bxkc',
loginTitle: '空串',
logoWidth: '400px',
bottomIcon: FaviconBxkc,
bottomColumn: '',
linkIcon: Link_Bxkc,
loginParam: 'DEFAULT',
navigationLogoWidth: '160px',
navigationMarginLeft: '175px'
},
designbxkc: {
title: '城市轨道交通设计平台',
loginPath: '/design/login?project=bxkc',
loginTitle: '空串',
logoWidth: '400px',
bottomIcon: FaviconBxkc,
bottomColumn: '',
linkIcon: Link_Bxkc,
loginParam: 'DEFAULT',
navigationLogoWidth: '160px',
navigationMarginLeft: '175px'
}
};
@ -173,7 +199,9 @@ export const ProjectIcon = {
jyd: FaviconJyd,
designjyd: FaviconJyd,
tky: FaviconTky,
designtky: FaviconTky
designtky: FaviconTky,
bxkc: FaviconBxkc,
designbxkc: FaviconBxkc
};
export const ProjectCode = {
@ -188,15 +216,17 @@ export const ProjectCode = {
jyd: 'JYD',
designjyd: 'JYD',
tky: 'TKY',
designtky: 'TKY'
designtky: 'TKY',
bxkc: 'BXKC',
designbxkc: 'BXKC'
};
export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky']; // 底部栏仅展示公司信息不展示备案号
export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc']; // 底部栏仅展示公司信息不展示备案号
export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb']; // 实训设计平台通过项目code获取地图列表的项目
export const CaseHideProjectList = ['heb', 'designheb']; // 案例展示隐藏的项目
export const VersionBaseNoShow = ['heb', 'designheb']; // 登录页右下角版本开发基于不展示
export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky']; // 登录页右下角主体不展示
export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc']; // 登录页右下角主体不展示
export const GenerateRouteProjectList = ['jsxt', 'refereeJsxt'];// 需要在公共路由中生成登录页面的项目
export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd']; // 登录页样式
export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc']; // 登录页样式
export const goOtherPlatformMenu = { // 导航栏快速切换平台
login: '/design/login',
design: '/login',
@ -211,9 +241,11 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台
jyd: '/design/login?project=jyd',
designjyd: '/login?project=jyd',
tky: '/design/login?project=tky',
designtky: '/login?project=tky'
designtky: '/login?project=tky',
bxkc: '/design/login?project=bxkc',
designbxkc: '/login?project=bxkc'
};
export const PermissionParam = { // 路径权限处理所需参数配置（跳转白名单&路径正则匹配&clientId）
export const PermissionParam = { // 路径权限处理所需参数配置（跳转白名单，路由处理类型）
heb: {
whitePage: '/login?project=heb',
systemType: '019'
@ -232,75 +264,59 @@ export const PermissionParam = { // 路径权限处理所需参数配置（跳
},
designxty: {
whitePage: '/design/login?project=xty',
// reg: /^\/designxty/,
systemType: '013'
// clientId: LoginParams.Design.clientId
},
designgzb: {
whitePage: '/design/login?project=gzb',
// reg: /^\/designgzb/,
systemType: '014'
// clientId: LoginParams.Design.clientId
},
designxadt: {
whitePage: '/design/login?project=xadt',
// reg: /^\/designxadt/,
systemType: '012'
// clientId: LoginParams.Design.clientId
},
designjyd: {
whitePage: '/design/login?project=jyd',
// reg: /^\/designjyd/,
systemType: '017'
// clientId: LoginParams.Design.clientId
},
designtky: {
whitePage: '/design/login?project=tky',
// reg: /^\/designtky/,
systemType: '018'
// clientId: LoginParams.Design.clientId
},
designbxkc: {
whitePage: '/design/login?project=bxkc',
systemType: '011'
},
xty: {
whitePage: '/login?project=xty',
// reg: /^\/xty/,
systemType: '013'
// clientId: null
},
gzb: {
whitePage: '/login?project=gzb',
// reg: /^\/gzb/,
systemType: '014'
// clientId: null
},
xadt: {
whitePage: '/login?project=xadt',
// reg: /^\/xadt/,
systemType: '012'
// clientId: null
},
jyd: {
whitePage: '/login?project=jyd',
// reg: /^\/jyd/,
systemType: '017'
// clientId: null
},
tky: {
whitePage: '/login?project=tky',
// reg: /^\/tky/,
systemType: '018'
// clientId: null
},
bxkc: {
whitePage: '/login?project=bxkc',
systemType: '011'
},
jsxt: {
whitePage: '/jsxt/login',
// reg: /^\/jsxt/,
systemType: '015'
// clientId: null
},
refereeJsxt: {
whitePage: '/refereeJsxt/login',
// reg: /^\/refereeJsxt/,
systemType: '015'
// clientId: LoginParams.Design.clientId
}
};
export const ProjectList = [

2
src/store/modules/training.js
View File

@ -242,7 +242,7 @@ const training = {
state.memberData[newMemberId].disabled = true;
state.memberData[newMemberId].trust = true;
},
updateMemberAndUser: (state, {simulationUserList, userId}) => {
simulationUserList.forEach(item => {
let memberIndex = -1;

2
src/utils/baseUrl.js
View File

@ -4,7 +4,7 @@ export function getBaseUrl() {
// BASE_API = 'https://joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';

20
src/views/newMap/jointTrainingNew/newChatView/chatBox.vue
View File

@ -146,7 +146,7 @@ export default {
memberIdList: [],
quitLoading: false,
conversitionMemberList: [],
isConversitionCreator: true,
isConversitionCreator: false,
messageList: []
};
},
@ -203,13 +203,16 @@ export default {
this.$refs.tree.filter(this.queryMember);
}
},
'$store.state.training.simulationUserList': function(val) {
this.simulationUsers = {};
if (val && val.length) {
val.forEach(user => {
this.simulationUsers[user.userId] = user;
});
}
'$store.state.training.simulationUserList': {
handler(val, o) {
this.simulationUsers = {};
if (val && val.length) {
val.forEach(user => {
this.simulationUsers[user.userId] = user;
});
}
},
deep: true
},
'$store.state.socket.overConversition': function (val) {
this.conversitionId = '';
@ -529,6 +532,7 @@ export default {
});
} else {
const user = this.simulationUsers[this.$store.state.user.id];
this.isConversitionCreator = conversation.creatorId == user.memberId;
!conversation.over && conversation.memberList.forEach(member =>{
if (member.memberId == user.memberId) {
this.conversitionMemberList = conversation.memberList;

4
src/views/newMap/jointTrainingNew/newChatView/chatMemberList.vue
View File

@ -7,8 +7,8 @@
:key="member.memberId"
class="each-chat-member"
:style="computedStyle(member)"
:title="memberData[member.memberId].label + (memberData[member.memberId].userId? '(' + simulationUsers[memberData[member.memberId].userId].nickName + ')': '')"
>{{ memberData[member.memberId].label + (memberData[member.memberId].userId? '(' + simulationUsers[memberData[member.memberId].userId].nickName + ')': '') }}</div>
:title="memberData[member.memberId].label + (memberData[member.memberId].userId? '(' + (simulationUsers[memberData[member.memberId].userId] || {}).nickName + ')': '')"
>{{ memberData[member.memberId].label + (memberData[member.memberId].userId? '(' + (simulationUsers[memberData[member.memberId].userId] || {}).nickName + ')': '') }}</div>
<!-- :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'" -->
</div>
</div>