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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-08-26 17:25:43 +08:00
commit f2df9fb453
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/store/modules/user.js
View File

@ -31,9 +31,6 @@ const user = {
SET_NICKNAME: (state, nickname) => { SET_NICKNAME: (state, nickname) => {
state.nickname = nickname; state.nickname = nickname;
}, },
SET_PROJECTDEVICE: (state, projectDevice) => {
state.projectDevice = projectDevice;
},
SET_ROLES: (state, roles) => { SET_ROLES: (state, roles) => {
state.roles = roles; state.roles = roles;
}, },
@ -110,9 +107,6 @@ const user = {
}); });
}); });
}, },
SetProjecteDevice({ commit }, deviceVo) {
commit('SET_PROJECTDEVICE', deviceVo);
},
// 获取用户信息 // 获取用户信息
GetInfo({ commit }, token) { GetInfo({ commit }, token) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

3
src/views/ibp/ibpsystem/index.vue
View File

@ -268,7 +268,10 @@ export default {
float: right; float: right;
right: 20px; right: 20px;
bottom: 15px; bottom: 15px;
z-index: 38;
} }
.ibp-canvas{ .ibp-canvas{
position: absolute;
z-index: 37;
} }
</style> </style>

4
src/views/newMap/jointTrainingNew/index.vue
View File

@ -339,7 +339,7 @@ export default {
this.$store.dispatch('training/setRoleDeviceCode', data.deviceCode); this.$store.dispatch('training/setRoleDeviceCode', data.deviceCode);
this.isAdmin = data.admin; this.isAdmin = data.admin;
const deviceVO = this.$store.state.user.projectDevice; const deviceVO = JSON.parse(getSessionStorage('projectDevice'));
if (deviceVO && deviceVO.type === 'VR_IBP') { if (deviceVO && deviceVO.type === 'VR_IBP') {
this.showIbp(this.deviceCode); this.showIbp(this.deviceCode);
const config = JSON.parse(deviceVO.config); const config = JSON.parse(deviceVO.config);
@ -405,7 +405,6 @@ export default {
case 'STATION_SUPERVISOR': case 'STATION_SUPERVISOR':
this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setPrdType', '01');
this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR'); this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR');
this.hideIbp();
if (this.lineCode === '06' && deviceCode) { if (this.lineCode === '06' && deviceCode) {
this.$refs.menuSchema.chiShowStation = deviceCode; this.$refs.menuSchema.chiShowStation = deviceCode;
this.mapViewLoadedOver && this.switchStationMode(deviceCode); this.mapViewLoadedOver && this.switchStationMode(deviceCode);
@ -499,6 +498,7 @@ export default {
window.open(routeData.href, '_blank', 'noopener noreferrer'); window.open(routeData.href, '_blank', 'noopener noreferrer');
}, },
showdriving() { showdriving() {
console.log('***************');
this.panelShow = true; this.panelShow = true;
this.drivingShow = false; this.drivingShow = false;
this.ibpShow = false; this.ibpShow = false;

3
src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
View File

@ -131,9 +131,6 @@ export default {
}, },
username() { username() {
return this.$store.state.user.nickname; return this.$store.state.user.nickname;
},
projectDevice() {
return this.$store.state.user.projectDevice;
} }
}, },
watch: { watch: {